commit 314695d3fda8d050a6c71bd441b6f021f796cb85
author fionaxu <fionaxu@google.com> Tue Sep 27 18:53:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 27 18:53:20 2016 +0000
tree 50aa5f7837c1cb67f0165a7e13315a4378d7861b
parent 1329fa444b13f16c5224785cc924bbbfe1006ce9
parent 25817195845820330de9e1351852fd35c3a5eb1c

Avoid run RadioInfo activity from non-system users am: b54cb2d18c am: a126537dc1
am: 2581719584

Change-Id: Ie8cd8ffcee12df54bb02f7d86e061f455651fdf8

src/com/android/settings/RadioInfo.java

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index af1392c..9c9eceb 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -29,7 +29,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.SystemProperties;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoCdma;
 import android.telephony.CellInfoGsm;
@@ -343,6 +342,11 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        if (!android.os.Process.myUserHandle().isSystem()) {
+            Log.e(TAG, "Not run from system user, don't do anything.");
+            finish();
+            return;
+        }
 
         setContentView(R.layout.radio_info);