Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63966b3e authored by Tony Mak's avatar Tony Mak
Browse files

Allow stopping user to access AppWidgetService API 

We now have isUserRunning && isUserKeyUnlockedisUserUnlocked instead of
having isUserUnlockingOrUnlocked. The difference is
we now allow stopping unlocked user to access the API.

Testing:
Write a simple widget which keep calling AppWidgetManager API in a loop.

1. In non-FBE mode, place the widget to launcher.
   Turn off work mode. No crash is observed.
2. Repeat 1 in FBE mode with separated work challenge.
3. Repeat 1 in FBE mode with no separated work challenge
4. Repeat 2 and reboot the device. Unlock work profile, widget is shown
5. Repeat 3, reboot device, widget is shown after rebot


Change-Id: I2fa9f602dcb0befff41fc6b145e9855e82d8d7a8
Fix: 29264823
parent 627bca6e

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+8 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.content.Context.KEYGUARD_SERVICE; 
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;



import android.annotation.UserIdInt;

import android.app.AlarmManager;

import android.app.AppGlobals;

import android.app.AppOpsManager;
@@ -66,6 +67,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.AtomicFile;
@@ -647,7 +649,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
    }



    private void ensureGroupStateLoadedLocked(int userId, boolean enforceUserUnlockingOrUnlocked) {

        if (enforceUserUnlockingOrUnlocked && !mUserManager.isUserUnlockingOrUnlocked(userId)) {

        if (enforceUserUnlockingOrUnlocked && !isUserRunningAndUnlocked(userId)) {

            throw new IllegalStateException(

                    "User " + userId + " must be unlocked for widgets to be available");

        }
@@ -692,6 +694,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        loadGroupStateLocked(newProfileIds);

    }



    private boolean isUserRunningAndUnlocked(@UserIdInt int userId) {

        return mUserManager.isUserRunning(userId) && StorageManager.isUserKeyUnlocked(userId);

    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,
@@ -3358,7 +3364,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            if (userInfo != null && userInfo.isManagedProfile()) {

                UserInfo parentInfo = mUserManager.getProfileParent(userId);

                if (parentInfo != null

                        && !mUserManager.isUserUnlockingOrUnlocked(parentInfo.getUserHandle())) {

                        && !isUserRunningAndUnlocked(parentInfo.getUserHandle().getIdentifier())) {

                    return true;

                }

            }