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

Commit 04751e2a authored by Guojing Yuan's avatar Guojing Yuan
Browse files

Update CDM sync API names 

Fix: 266591620

Test: CTS
Change-Id: I09f66e605676cc792fe889e701c96d9ffa6bfb08
parent 10bb3f38

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9461,10 +9461,10 @@ package android.companion { 
    method @Nullable public android.content.IntentSender buildAssociationCancellationIntent();

    method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException;

    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method public void disableSystemDataSync(int, int);

    method public void disableSystemDataSyncForTypes(int, int);

    method @Deprecated public void disassociate(@NonNull String);

    method public void disassociate(int);

    method public void enableSystemDataSync(int, int);

    method public void enableSystemDataSyncForTypes(int, int);

    method @Deprecated @NonNull public java.util.List<java.lang.String> getAssociations();

    method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations();

    method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName);

core/java/android/companion/CompanionDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ public final class CompanionDeviceManager { 
     * @param associationId id of the device association.

     * @param flags system data types to be enabled.

     */

    public void enableSystemDataSync(int associationId, @DataSyncTypes int flags) {

    public void enableSystemDataSyncForTypes(int associationId, @DataSyncTypes int flags) {

        if (!checkFeaturePresent()) {

            return;

        }
@@ -513,7 +513,7 @@ public final class CompanionDeviceManager { 
     * @param associationId id of the device association.

     * @param flags system data types to be disabled.

     */

    public void disableSystemDataSync(int associationId, @DataSyncTypes int flags) {

    public void disableSystemDataSyncForTypes(int associationId, @DataSyncTypes int flags) {

        if (!checkFeaturePresent()) {

            return;

        }