Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev

Browse Source 
am: ab8d4cf645

Change-Id: I2280fae9d85594ad0fde5d552ff07b0d4e0c6158
This commit is contained in:
Tony Mak
2016-06-17 17:09:22 +00:00
committed by android-build-merger
parent 9caec9ff63 ab8d4cf645
commit 95d0d631ba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -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;
@@ -67,6 +68,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;
@@ -650,7 +652,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");
}
@@ -695,6 +697,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,
@@ -3381,7 +3387,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;
}
}