PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32649929'] into 25Q2-release.

Browse Source 
Change-Id: I9335e3e4e9d90c255d17b9a8bdd7d46e87189bf8
This commit is contained in:
Android Build Coastguard Worker
2025-04-01 20:54:39 -07:00
parent c8c292cede 1127cfb00f
commit 2b76145529
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/TestingSettingsBroadcastReceiver.java
View File

@@ -20,12 +20,17 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.settings.Settings.TestingSettingsActivity; import com.android.settings.Settings.TestingSettingsActivity;
public class TestingSettingsBroadcastReceiver extends BroadcastReceiver { public class TestingSettingsBroadcastReceiver extends BroadcastReceiver {
private final static String TAG = "TestingSettingsBroadcastReceiver";
public TestingSettingsBroadcastReceiver() { public TestingSettingsBroadcastReceiver() {
} }
@@ -35,10 +40,18 @@ public class TestingSettingsBroadcastReceiver extends BroadcastReceiver {
if (intent != null && intent.getAction() != null if (intent != null && intent.getAction() != null
&& intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE) && intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)
&& !isDisabled(context)) { && !isDisabled(context)) {
Intent i = new Intent(Intent.ACTION_MAIN); UserManager userManager = context.getSystemService(UserManager.class);
i.setClass(context, TestingSettingsActivity.class); UserHandle currentUser = Process.myUserHandle();
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (userManager != null) {
context.startActivity(i); if (userManager.getUserInfo(currentUser.hashCode()).isMain()) {
Intent i = new Intent(Intent.ACTION_MAIN);
i.setClass(context, TestingSettingsActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(i);
} else {
Log.d(TAG, "Not main user, not starting TestingSettingsActivity.");
}
}
} }
} }