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

Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev am: f883ea697e" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-04-08 19:23:56 +00:00
committed by Android (Google) Code Review
parent eb553b0df7 45fd1f4e6d
commit 310c197142
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/PackageManagerInternal.java
View File

@@ -193,8 +193,10 @@ public abstract class PackageManagerInternal {
*
* @param packageName package name of the default home, or {@code null} to remove
* @param userId the user id
* @param callback the callback made after the default home as been updated
*/
void setDefaultHomeAsync(@Nullable String packageName, @UserIdInt int userId);
void setDefaultHomeAsync(@Nullable String packageName, @UserIdInt int userId,
@NonNull Consumer<Boolean> callback);
}
/**

21
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -19710,8 +19710,9 @@ public class PackageManagerService extends IPackageManager.Stub
filter.dump(new LogPrinter(Log.INFO, TAG), " ");
pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
scheduleWritePackageRestrictionsLocked(userId);
postPreferredActivityChangedBroadcast(userId);
updateDefaultHomeLPw(userId);
if (!updateDefaultHomeLPw(userId)) {
postPreferredActivityChangedBroadcast(userId);
}
}
}
@@ -20490,7 +20491,10 @@ public class PackageManagerService extends IPackageManager.Stub
return null;
}
private void updateDefaultHomeLPw(int userId) {
/**
* @return Whether the ACTION_PREFERRED_ACTIVITY_CHANGED broadcast has been scheduled.
*/
private boolean updateDefaultHomeLPw(int userId) {
Intent intent = getHomeIntent();
List<ResolveInfo> resolveInfos = queryIntentActivitiesInternal(intent, null,
PackageManager.GET_META_DATA, userId);
@@ -20501,15 +20505,20 @@ public class PackageManagerService extends IPackageManager.Stub
? preferredResolveInfo.activityInfo.packageName : null;
String currentPackageName = mDefaultHomeProvider.getDefaultHome(userId);
if (TextUtils.equals(currentPackageName, packageName)) {
return;
return false;
}
String[] callingPackages = getPackagesForUid(Binder.getCallingUid());
if (callingPackages != null && ArrayUtils.contains(callingPackages,
mRequiredPermissionControllerPackage)) {
// PermissionController manages default home directly.
return;
return false;
}
mDefaultHomeProvider.setDefaultHomeAsync(packageName, userId);
mDefaultHomeProvider.setDefaultHomeAsync(packageName, userId, (successful) -> {
if (successful) {
postPreferredActivityChangedBroadcast(userId);
}
});
return true;
}
@Override

11
services/core/java/com/android/server/role/RoleManagerService.java
View File

@@ -85,6 +85,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
/**
* Service for role management.
@@ -780,19 +781,21 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
}
@Override
public void setDefaultHomeAsync(@Nullable String packageName, @UserIdInt int userId) {
RemoteCallback callback = new RemoteCallback(result -> {
public void setDefaultHomeAsync(@Nullable String packageName, @UserIdInt int userId,
@NonNull Consumer<Boolean> callback) {
RemoteCallback remoteCallback = new RemoteCallback(result -> {
boolean successful = result != null;
if (!successful) {
Slog.e(LOG_TAG, "Failed to set default home: " + packageName);
}
callback.accept(successful);
});
if (packageName != null) {
getOrCreateControllerService(userId).onAddRoleHolder(RoleManager.ROLE_HOME,
packageName, 0, callback);
packageName, 0, remoteCallback);
} else {
getOrCreateControllerService(userId).onClearRoleHolders(RoleManager.ROLE_HOME, 0,
callback);
remoteCallback);
}
}
}