Merge "Ignore incorrect NewApi Lint warning for CDM getAllAssociations()"
diff --git a/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java b/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java
index 7e1cf5c..d3e3843 100644
--- a/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java
+++ b/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java
@@ -16,6 +16,7 @@
package com.android.server.connectivity.wear;
+import android.annotation.SuppressLint;
import android.companion.AssociationInfo;
import android.companion.CompanionDeviceManager;
import android.content.Context;
@@ -40,6 +41,10 @@
mContext = context;
}
+ // TODO(b/193460475): Android Lint handles change from SystemApi to public incorrectly.
+ // CompanionDeviceManager#getAllAssociations() is made public in U,
+ // but existed in T as an identical SystemApi.
+ @SuppressLint("NewApi")
@Override
public List<AssociationInfo> getAllAssociations() {
PermissionUtils.enforceNetworkStackPermission(mContext);