commit d76a3ed937fc783a7a7beeda0fe5f73d3ae9b6c4
author Chen Xu <fionaxu@google.com> Tue Sep 27 18:38:18 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 18:38:19 2016 +0000
tree 6d37e911544959706f0bbd428bd4a902e13c59ca
parent 59d2b185f30c924d8ad17f421e19bab05f30bc5a
parent b54cb2d18cf2e8d5dd45781079f0b4ad27649b25

Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev

src/com/android/settings/RadioInfo.java

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index b071cc3..54ff4db 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);