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

Merge "Remove the owner userid of cross-profile intent filters."

Browse Source
This commit is contained in:
Nicolas Prevot
2015-03-16 11:25:50 +00:00
committed by Android (Google) Code Review
parent 4cd92835be 4b8d582151
commit 8458e531bf
5 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ApplicationPackageManager.java
View File

@@ -1662,7 +1662,7 @@ final class ApplicationPackageManager extends PackageManager {
int flags) {
try {
mPM.addCrossProfileIntentFilter(filter, mContext.getOpPackageName(),
mContext.getUserId(), sourceUserId, targetUserId, flags);
sourceUserId, targetUserId, flags);
} catch (RemoteException e) {
// Should never happen!
}
@@ -1674,8 +1674,7 @@ final class ApplicationPackageManager extends PackageManager {
@Override
public void clearCrossProfileIntentFilters(int sourceUserId) {
try {
mPM.clearCrossProfileIntentFilters(sourceUserId, mContext.getOpPackageName(),
mContext.getUserId());
mPM.clearCrossProfileIntentFilters(sourceUserId, mContext.getOpPackageName());
} catch (RemoteException e) {
// Should never happen!
}

4
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -261,9 +261,9 @@ interface IPackageManager {
void clearPackagePersistentPreferredActivities(String packageName, int userId);
void addCrossProfileIntentFilter(in IntentFilter intentFilter, String ownerPackage,
int ownerUserId, int sourceUserId, int targetUserId, int flags);
int sourceUserId, int targetUserId, int flags);
void clearCrossProfileIntentFilters(int sourceUserId, String ownerPackage, int ownerUserId);
void clearCrossProfileIntentFilters(int sourceUserId, String ownerPackage);
/**
* Report the set of 'Home' activity candidates, plus (if any) which of them