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

Merge "Guard ACTION_PROFILE_INACCESSIBLE with version check" into udc-dev am: 564cd388c6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23192128

Change-Id: Ibd5c3043685a7ae201f2fcac01ac1ef1cb1cebfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pavel Grafov
2023-05-15 21:27:46 +00:00
committed by Automerger Merge Worker
parent 890a73c274 564cd388c6
commit 3530786cd1
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherModel.java
+12 -5
View File
@@ -92,6 +92,15 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
static final String TAG = "Launcher.Model"; static final String TAG = "Launcher.Model";
// Broadcast intent to track when the profile gets locked:
// ACTION_MANAGED_PROFILE_UNAVAILABLE can be used until Android U where profile no longer gets
// locked when paused.
// ACTION_PROFILE_INACCESSIBLE always means that the profile is getting locked but it only
// appeared in Android S.
private static final String ACTION_PROFILE_LOCKED = Utilities.ATLEAST_U
? Intent.ACTION_PROFILE_INACCESSIBLE
: Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE;
@NonNull @NonNull
private final LauncherAppState mApp; private final LauncherAppState mApp;
@NonNull @NonNull
@@ -290,9 +299,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
// If we have changed locale we need to clear out the labels in all apps/workspace. // If we have changed locale we need to clear out the labels in all apps/workspace.
forceReload(); forceReload();
} else if (Intent.ACTION_MANAGED_PROFILE_AVAILABLE.equals(action) } else if (Intent.ACTION_MANAGED_PROFILE_AVAILABLE.equals(action)
|| Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)
|| Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action) || Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action)
|| Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) { || Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)
|| Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)) {
UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER); UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);
if (TestProtocol.sDebugTracing) { if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.WORK_TAB_MISSING, "onBroadcastIntent intentAction: " + action + Log.d(TestProtocol.WORK_TAB_MISSING, "onBroadcastIntent intentAction: " + action +
@@ -305,9 +314,7 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
PackageUpdatedTask.OP_USER_AVAILABILITY_CHANGE, user)); PackageUpdatedTask.OP_USER_AVAILABILITY_CHANGE, user));
} }
// ACTION_PROFILE_INACCESSIBLE sends the profile back to locked mode, so if (ACTION_PROFILE_LOCKED.equals(action)
// we need to run the state change task again.
if (Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)
|| Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) { || Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {
enqueueModelUpdateTask(new UserLockStateChangedTask( enqueueModelUpdateTask(new UserLockStateChangedTask(
user, Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action))); user, Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)));