From eb2b87aa399bc7b3f232055fd26f749c37f0e482 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Fri, 31 Jan 2020 00:33:11 +0800
Subject: [PATCH] [Settings] Avoid non-owner from crash mobile data settings

Some instance not been initialized under non-owner user mode.

Bug: 146562321
Test: manual
Change-Id: I4f8ac955754cbd8692727a1d0adf283ef3ff512c
---
 .../settings/network/telephony/MobileNetworkActivity.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 9dd6ddde15e..0f3d289ce0e 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -118,6 +118,9 @@ public class MobileNetworkActivity extends SettingsBaseActivity
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        if (mProxySubscriptionMgr == null) {
+            return;
+        }
         mProxySubscriptionMgr.removeActiveSubscriptionsListener(this);
     }