commit b54cb2d18cf2e8d5dd45781079f0b4ad27649b25
author fionaxu <fionaxu@google.com> Thu Sep 22 15:01:05 2016 -0700
committer fionaxu <fionaxu@google.com> Tue Sep 27 09:51:12 2016 -0700
tree cf55797b01748dccda8667e231fe45015b2cadec
parent 20d19a89dad0542838a24f43eb6a4a5a3ad43d76

Avoid run RadioInfo activity from non-system users

RadioInfo is hidden from testing menu, but it could be launched
from explicit intents for example. Add system user check to avoid
phone process crash.

Bug: 31219235
Change-Id: I5661fbe0889b1ee9d0dea6810f4a4cde2c9d9e22

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);