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

Change associate return type to void

Browse Source 
Per API council feedback, since result wasn't meaningfully used

Fixes: 184264581
Test: presubmit

Change-Id: I65f2df6c2ce346c52cfc3f70d0ed8b63c41546d5
This commit is contained in:
Eugene Susla
2021-04-01 10:24:28 -07:00
parent a2170c2b71
commit c248630cff
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -2230,7 +2230,7 @@ package android.bluetooth.le {
package android.companion {
public final class CompanionDeviceManager {
method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public boolean associate(@NonNull String, @NonNull android.net.MacAddress);
method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public void associate(@NonNull String, @NonNull android.net.MacAddress);
method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, int);
method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle);
}

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

@@ -439,24 +439,22 @@ public final class CompanionDeviceManager {
/**
* Associates given device with given app for the given user directly, without UI prompt.
*
* @return whether successful
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES)
public boolean associate(
public void associate(
@NonNull String packageName,
@NonNull MacAddress macAddress) {
if (!checkFeaturePresent()) {
return false;
return;
}
Objects.requireNonNull(packageName, "package name cannot be null");
Objects.requireNonNull(macAddress, "mac address cannot be null");
UserHandle user = android.os.Process.myUserHandle();
try {
return mService.createAssociation(
mService.createAssociation(
packageName, macAddress.toString(), user.getIdentifier());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();

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

@@ -52,5 +52,5 @@ interface ICompanionDeviceManager {
boolean canPairWithoutPrompt(in String packageName, in String deviceMacAddress, int userId);
boolean createAssociation(in String packageName, in String macAddress, int userId);
void createAssociation(in String packageName, in String macAddress, int userId);
}

3
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -644,13 +644,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
@Override
public boolean createAssociation(String packageName, String macAddress, int userId) {
public void createAssociation(String packageName, String macAddress, int userId) {
getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES, "createAssociation");
addAssociation(new Association(
userId, macAddress, packageName, null, false, System.currentTimeMillis()));
return true;
}
private void checkCanCallNotificationApi(String callingPackage) throws RemoteException {