Revert "Settings: Add Superuser entry"

This reverts commit 2cfbca407175a3fd28083f1f849a67b0ed252952.

diff --git a/Android.mk b/Android.mk
index c2c460c..7043ad4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,12 +23,6 @@ ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_JACK_ENABLED := incremental
 endif
 
-LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
-LOCAL_AAPT_FLAGS += --extra-packages com.koushikdutta.superuser:com.koushikdutta.widgets --auto-add-overlay
-
-LOCAL_SRC_FILES += $(call all-java-files-under,../../../external/koush/Superuser/Superuser/src) $(call all-java-files-under,../../../external/koush/Widgets/Widgets/src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../external/koush/Widgets/Widgets/res $(LOCAL_PATH)/../../../external/koush/Superuser/Superuser/res
-
 include frameworks/opt/setupwizard/navigationbar/common.mk
 include frameworks/opt/setupwizard/library/common.mk
 include frameworks/base/packages/SettingsLib/common.mk

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a920e53..76acedd 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,30 +83,6 @@
     <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
 
-    <permission
-        android:name="android.permission.REQUEST_SUPERUSER"
-        android:protectionLevel="signature" />
-
-    <permission
-        android:name="android.permission.REPORT_SUPERUSER"
-        android:protectionLevel="signature" />
-
-    <permission-group
-        android:name="android.permission-group.SUPERUSER"
-        android:description="@string/superuser_description_more"
-        android:icon="@drawable/ic_action_permission"
-        android:label="@string/superuser"
-        android:priority="10000" />
-
-    <permission
-        android:name="android.permission.ACCESS_SUPERUSER"
-        android:description="@string/superuser_description_more"
-        android:icon="@drawable/ic_action_permission"
-        android:label="@string/superuser_description"
-        android:logo="@drawable/ic_action_permission"
-        android:permissionGroup="android.permission-group.SUPERUSER"
-        android:protectionLevel="dangerous" />
-
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
@@ -117,47 +93,6 @@
             android:allowBackup="false"
             android:usesCleartextTraffic="true">
 
-        <!-- Only system/su can open this activity -->
-        <!-- This activity will then call the MultitaskSuRequestActivity to create a new task stack -->
-        <activity
-            android:name=".cyanogenmod.superuser.RequestActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/superuser"
-            android:launchMode="singleTask"
-            android:excludeFromRecents="true"
-            android:permission="android.permission.REQUEST_SUPERUSER"
-            android:process=":superuser"
-            android:taskAffinity="com.android.settings.superuser"
-            android:theme="@style/RequestThemeDark" />
-        <!-- Only system/su can open this activity -->
-        <!-- This is activity is started in multiuser mode when the user invoking su -->
-        <!-- is not the device owner (user id 0). -->
-        <activity
-            android:name=".cyanogenmod.superuser.NotifyActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/superuser"
-            android:launchMode="singleTask"
-            android:excludeFromRecents="true"
-            android:permission="android.permission.REQUEST_SUPERUSER"
-            android:process=":superuser"
-            android:taskAffinity="com.android.settings.superuser"
-            android:theme="@style/RequestThemeDark" />
-
-        <!-- Multiple instances of this activity can be running for multiple su requests -->
-        <activity
-            android:name=".cyanogenmod.superuser.MultitaskSuRequestActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:label="@string/request"
-            android:process=":superuser"
-            android:taskAffinity="com.android.settings.superuser"
-            android:theme="@style/RequestThemeDark" />
-
-        <receiver
-            android:name=".cyanogenmod.superuser.SuReceiver"
-            android:permission="android.permission.REPORT_SUPERUSER" />
-
         <!-- Settings -->
 
         <activity android:name="Settings"

diff --git a/proguard.flags b/proguard.flags
index 841bc88..578ff4d 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -16,8 +16,6 @@
 -keep class com.android.settings.users.*
 -keep class com.android.settings.nfc.*
 -keep class com.android.settings.notification.*
--keep class com.koushikdutta.**
--keep class com.android.settings.cyanogenmod.superuser.**
 
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {

diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index d8d6212..f46a820 100644 (file)
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -248,14 +248,6 @@
                 android:icon="@drawable/ic_settings_print"
                 />
 
-        <!-- Superuser -->
-        <dashboard-tile
-                android:id="@+id/superuser_settings"
-                android:title="@string/superuser"
-                android:fragment="com.android.settings.cyanogenmod.superuser.PolicyNativeFragment"
-                android:icon="@drawable/ic_action_permission"
-                />
-
         <!-- Development -->
         <dashboard-tile
                 android:id="@+id/development_settings"

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 31385d5..3372e51 100644 (file)
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -691,13 +691,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 .getStringArray(R.array.root_access_entries)[Integer.valueOf(value)]);
     }
 
-    /* package */ static boolean isRootForAppsEnabled() {
-        int value = SystemProperties.getInt(ROOT_ACCESS_PROPERTY, 1);
-        boolean daemonState =
-                SystemProperties.get("init.svc.su_daemon", "absent").equals("running");
-        return daemonState && (value == 1 || value == 3);
-    }
-
     private void writeRootAccessOptions(Object newValue) {
         String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, "1");
         SystemProperties.set(ROOT_ACCESS_PROPERTY, newValue.toString());

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 991fcae..01b027a 100644 (file)
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1296,10 +1296,6 @@ public class SettingsActivity extends Activity
                     if (!hasPrintingSupport) {
                         removeTile = true;
                     }
-                } else if (id == R.id.superuser_settings) {
-                    if (!DevelopmentSettings.isRootForAppsEnabled()) {
-                        removeTile = true;
-                    }
                 } else if (id == R.id.development_settings) {
                     if (!showDev || um.hasUserRestriction(
                             UserManager.DISALLOW_DEBUGGING_FEATURES)) {

diff --git a/src/com/android/settings/cyanogenmod/superuser/MultitaskSuRequestActivity.java b/src/com/android/settings/cyanogenmod/superuser/MultitaskSuRequestActivity.java
deleted file mode 100644 (file)
index 0103076..0000000
--- a/src/com/android/settings/cyanogenmod/superuser/MultitaskSuRequestActivity.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.settings.cyanogenmod.superuser;
-
-public class MultitaskSuRequestActivity extends com.koushikdutta.superuser.MultitaskSuRequestActivity {
-}
\ No newline at end of file

diff --git a/src/com/android/settings/cyanogenmod/superuser/NotifyActivity.java b/src/com/android/settings/cyanogenmod/superuser/NotifyActivity.java
deleted file mode 100644 (file)
index 23aa6a7..0000000
--- a/src/com/android/settings/cyanogenmod/superuser/NotifyActivity.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.settings.cyanogenmod.superuser;
-
-public class NotifyActivity extends com.koushikdutta.superuser.NotifyActivity {
-}
\ No newline at end of file

diff --git a/src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java b/src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java
deleted file mode 100644 (file)
index 1c74543..0000000
--- a/src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.settings.cyanogenmod.superuser;
-
-public class PolicyNativeFragment extends com.koushikdutta.superuser.PolicyNativeFragment {
-}
\ No newline at end of file

diff --git a/src/com/android/settings/cyanogenmod/superuser/RequestActivity.java b/src/com/android/settings/cyanogenmod/superuser/RequestActivity.java
deleted file mode 100644 (file)
index e6deca4..0000000
--- a/src/com/android/settings/cyanogenmod/superuser/RequestActivity.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.settings.cyanogenmod.superuser;
-
-public class RequestActivity extends com.koushikdutta.superuser.RequestActivity {
-}
\ No newline at end of file

diff --git a/src/com/android/settings/cyanogenmod/superuser/SuReceiver.java b/src/com/android/settings/cyanogenmod/superuser/SuReceiver.java
deleted file mode 100644 (file)
index c4f9174..0000000
--- a/src/com/android/settings/cyanogenmod/superuser/SuReceiver.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.settings.cyanogenmod.superuser;
-
-public class SuReceiver extends com.koushikdutta.superuser.SuReceiver {
-}
\ No newline at end of file