From d3b1fa80819dfaa6364f95d23e136208d24ba092 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 Merged-In: I681d88d7f2f0f923850d33219a1ee56eedf87cad Change-Id: I681d88d7f2f0f923850d33219a1ee56eedf87cad --- .../settings/TestingSettingsBroadcastReceiver.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index 2172cd07d60..4f98bdb1616 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,22 +1,20 @@ 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; public class TestingSettingsBroadcastReceiver extends BroadcastReceiver { - public TestingSettingsBroadcastReceiver() { } - + @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);