コミット: 2ac2efe3c39c88f53d8dfffda91c34932a3731be - packages-apps-Superuser (git)

packages/apps/Superuser

コミットメタ情報

• リビジョン: 2ac2efe3c39c88f53d8dfffda91c34932a3731be (tree)
• 日時: 2012-01-29 09:20:38
• 作者: Steve Kondik <shade@chem...>
• コミッター: Steve Kondik

ログメッセージ

superuser: Prompt user to enable root access

• CM allows the user to disable root. Prompt if disabled.
  

Change-Id: Ib1ec84d5c2a574d8d7c19ad85f95d2f3988e82da

変更サマリ

• modified: res/values/strings.xml
• modified: src/com/noshufou/android/su/HomeActivity.java

差分

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,4 +265,7 @@
     <!-- Do not translate any strings below, they are here to prevent build errors -->
     <string name="before_secret_code">*#*#</string>
     <string name="after_secret_code">#*#*</string>
+
+    <string name="root_disabled_title">Enable root access?</string>
+    <string name="root_disabled_summary">Root access is currently disabled for all applications by a system setting. Would you like to enable it?</string>
 </resources>

--- a/src/com/noshufou/android/su/HomeActivity.java
+++ b/src/com/noshufou/android/su/HomeActivity.java
@@ -6,14 +6,18 @@ import com.noshufou.android.su.util.Util;
 import com.noshufou.android.su.widget.ChangeLog;
 import com.noshufou.android.su.widget.PagerHeader;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.TransitionDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.SystemProperties;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -30,7 +34,7 @@ import android.widget.ImageView;
 
 import java.util.ArrayList;
 
-public class HomeActivity extends FragmentActivity {
+public class HomeActivity extends FragmentActivity implements DialogInterface.OnClickListener {
 //    private static final String TAG = "Su.HomeActivity";
 
     private static final int MENU_ELITE = 0;
@@ -46,6 +50,9 @@ public class HomeActivity extends FragmentActivity {
     private ViewPager mPager;
     private TransitionDrawable mTitleLogo;
 
+    private static final String CM_VERSION = SystemProperties.get("ro.cm.version", "");
+    private static final String ROOT_ACCESS_PROPERTY = "persist.sys.root_access";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,6 +109,31 @@ public class HomeActivity extends FragmentActivity {
         if (cl.firstRun()) {
             cl.getLogDialog().show();
         }
+
+        // Check for root enabled on CyanogenMod 9
+        if (CM_VERSION.length() > 0) {
+            String root = SystemProperties.get(ROOT_ACCESS_PROPERTY, "1");
+            // 0: off, 1: apps, 2: adb, 3: both
+            if ("0".equals(root) || "2".equals(root)) {
+                Dialog dialog = new AlertDialog.Builder(this).setMessage(
+                        getResources().getString(R.string.root_disabled_summary))
+                        .setTitle(R.string.root_disabled_title)
+                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setPositiveButton(android.R.string.yes, this)
+                        .setNegativeButton(android.R.string.no, this)
+                        .show();
+            }
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            Intent settings = new Intent("android.settings.APPLICATION_DEVELOPMENT_SETTINGS");
+            settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(settings);
+            finish();
+        }
     }
 
     @Override