From b54cb2d18cf2e8d5dd45781079f0b4ad27649b25 Mon Sep 17 00:00:00 2001
From: fionaxu <fionaxu@google.com>
Date: Thu, 22 Sep 2016 15:01:05 -0700
Subject: [PATCH] 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index b071cc30a72..54ff4dbecd0 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -29,7 +29,6 @@ import android.os.AsyncResult;
 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 @@ public class RadioInfo extends Activity {
     @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);