Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c248630c authored by Eugene Susla's avatar Eugene Susla
Browse files

Change associate return type to void 

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

Fixes: 184264581
Test: presubmit

Change-Id: I65f2df6c2ce346c52cfc3f70d0ed8b63c41546d5
parent a2170c2b

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);















  }

































core/java/android/companion/CompanionDeviceManager.java



+3
−5




























Original line number
Diff line number
Diff line








@@ -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();

































core/java/android/companion/ICompanionDeviceManager.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);















}
























services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -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 {