From 27c6358127fc31ea237103ce4fc9227170098ab8 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Wed, 19 Feb 2020 20:59:54 -0800 Subject: [PATCH] Secret code fix - uses public symbol for secret There were two CLs that conflicted causing the functionality to break again. This CL switches back to TestingSettingsBroadcastReceiver back to using the secret code on TelephonyManager. This is Ok because ag/10331474 moves AndroidManifest to same flag. Test: Brought up "Testing" activity using secret code Test: Hit breakpoint in TestingSettingsBroadcastReceiver within if block. Bug: 149524255 Change-Id: I681d88d7f2f0f923850d33219a1ee56eedf87cad --- .../android/settings/TestingSettingsBroadcastReceiver.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index aa28a189d6e..0e1296ba578 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,10 +1,9 @@ package com.android.settings; -import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.telephony.TelephonyManager; import com.android.settings.Settings.TestingSettingsActivity; @@ -16,7 +15,7 @@ public class TestingSettingsBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(SECRET_CODE_ACTION)) { + if (intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)) { Intent i = new Intent(Intent.ACTION_MAIN); i.setClass(context, TestingSettingsActivity.class); i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);