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

Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev

Browse Source 
am: 0ac8fd7adb

Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9
This commit is contained in:
Eugene Susla
2017-04-10 15:18:14 +00:00
committed by android-build-merger
parent 09d6e39613 0ac8fd7adb
commit d2d45e9de8
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -167,7 +167,7 @@ public final class CompanionDeviceManager {
return Collections.emptyList();
}
try {
return mService.getAssociations(mContext.getPackageName());
return mService.getAssociations(mContext.getPackageName(), mContext.getUserId());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}

2
core/java/android/companion/ICompanionDeviceManager.aidl
View File

@@ -29,7 +29,7 @@ interface ICompanionDeviceManager {
in IFindDeviceCallback callback,
in String callingPackage);
List<String> getAssociations(String callingPackage);
List<String> getAssociations(String callingPackage, int userId);
void disassociate(String deviceMacAddress, String callingPackage);
//TODO add these