Merge "Application accepts null intents causing a crash"

2018-10-01 21:11:56 +00:00
parent 3600c03392 af9eb2d7a7
commit 1161052e70
2 changed files with 16 additions and 1 deletions
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -231,9 +231,13 @@ public class ApnEditor extends SettingsPreferenceFragment

        final Intent intent = getIntent();
        final String action = intent.getAction();
+        if (TextUtils.isEmpty(action)) {
+            finish();
+            return;
+        }
+
        mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
        mReadOnlyApn = false;
        mReadOnlyApnTypes = null;
        mReadOnlyApnFields = null;