Fix 0001-vold-switchable-pair.patch

dazjo · Apr 26, 2015 · 3011829 · 3011829
1 parent 0ed0903
commit 3011829
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/patches/packages_apps_Settings/0001-vold-switchable-pair.patch b/patches/packages_apps_Settings/0001-vold-switchable-pair.patch
@@ -1,4 +1,4 @@
-From d95a76e3556eaf5eabdfd43f9f0230373e188f18 Mon Sep 17 00:00:00 2001
+From f25db4944c0492185e2b36a133591f256fc22eaa Mon Sep 17 00:00:00 2001
 From: dhacker29 <davidhackerdvm@gmail.com>
 Date: Sat, 17 Aug 2013 16:35:18 -0500
 Subject: [PATCH] Add setting for Vold Switchable Pair (2/2)
@@ -17,22 +17,22 @@ Change-Id: Id83fc90d771ca3a7179f2c50d0ae828eb3dbaa9f
  4 files changed, 66 insertions(+), 1 deletion(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 5825e8e..5993e07 100644
+index 7fd7291..9b878fa 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -72,6 +72,7 @@
-     <uses-permission android:name="android.permission.CHANGE_PRIVACY_GUARD_STATE" />
+@@ -73,6 +73,7 @@
      <uses-permission android:name="android.permission.READ_PHONE_BLACKLIST" />
      <uses-permission android:name="android.permission.CHANGE_PHONE_BLACKLIST" />
+     <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />
 +    <uses-permission android:name="android.permission.REBOOT" />
 
      <permission
          android:name="android.permission.REQUEST_SUPERUSER"
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index ed81926..6667e5a 100644
+index 79c8a8c..17ef509 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
-@@ -700,6 +700,13 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
+@@ -734,6 +734,13 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
      <string name="adb_notify">USB debugging notify</string>
      <string name="adb_notify_summary">Display a notification when USB debugging is connected</string>
 
@@ -45,7 +45,7 @@ index ed81926..6667e5a 100644
 +
      <!-- Android debugging over WiFi -->
      <string name="adb_over_network">ADB over network</string>
-     <string name="adb_over_network_summary">Enable TCP/IP debugging over network interfaces (Wi-Fi, USB networks). This setting is reset on reboot</string>
+     <string name="adb_over_network_summary">Enable TCP/IP debugging over network interfaces (Wi\u2011Fi, USB networks). This setting is reset on reboot</string>
 diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
 index e905f39..2010b2c 100644
 --- a/res/xml/device_info_memory.xml
@@ -63,7 +63,7 @@ index e905f39..2010b2c 100644
  <!-- Preference categories are dynamically created based on the list of available storage volumes -->
 
 diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
-index 52fef32..5b79865 100644
+index 18fa6fd..34af290 100644
 --- a/src/com/android/settings/deviceinfo/Memory.java
 +++ b/src/com/android/settings/deviceinfo/Memory.java
 @@ -32,16 +32,20 @@ import android.hardware.usb.UsbManager;
@@ -87,7 +87,7 @@ index 52fef32..5b79865 100644
  import android.util.Log;
  import android.view.Menu;
  import android.view.MenuInflater;
-@@ -80,6 +84,10 @@ public class Memory extends SettingsPreferenceFragment {
+@@ -81,6 +85,10 @@ public class Memory extends SettingsPreferenceFragment {
      private UsbManager mUsbManager;
 
      private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
@@ -98,7 +98,7 @@ index 52fef32..5b79865 100644
 
      @Override
      public void onCreate(Bundle icicle) {
-@@ -94,6 +102,27 @@ public class Memory extends SettingsPreferenceFragment {
+@@ -95,6 +103,27 @@ public class Memory extends SettingsPreferenceFragment {
 
          addPreferencesFromResource(R.xml.device_info_memory);
 
@@ -126,7 +126,7 @@ index 52fef32..5b79865 100644
          addCategory(StorageVolumePreferenceCategory.buildForInternal(context));
 
          final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
-@@ -213,7 +242,13 @@ public class Memory extends SettingsPreferenceFragment {
+@@ -214,7 +243,13 @@ public class Memory extends SettingsPreferenceFragment {
 
      @Override
      public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
@@ -141,7 +141,7 @@ index 52fef32..5b79865 100644
              ConfirmClearCacheFragment.show(this);
              return true;
          }
-@@ -423,4 +458,21 @@ public class Memory extends SettingsPreferenceFragment {
+@@ -437,4 +472,21 @@ public class Memory extends SettingsPreferenceFragment {
              return builder.create();
          }
      }
@@ -164,5 +164,5 @@ index 52fef32..5b79865 100644
 +    }
  }
 -- 
-1.8.1.2
+1.9.1