Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e (412a19d6) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -2063,8 +2063,6 @@ Landroid/database/sqlite/SQLiteStatement;-><init>(Landroid/database/sqlite/SQLit
		Landroid/database/sqlite/SqliteWrapper;->checkSQLiteException(Landroid/content/Context;Landroid/database/sqlite/SQLiteException;)V
		Landroid/database/sqlite/SqliteWrapper;->delete(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I
		Landroid/database/sqlite/SqliteWrapper;->update(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
		Landroid/ddm/DdmHandleAppName;->getAppName()Ljava/lang/String;
		Landroid/ddm/DdmHandleAppName;->setAppName(Ljava/lang/String;I)V
		Landroid/filterfw/core/Filter;-><init>(Ljava/lang/String;)V
		Landroid/filterfw/core/Filter;->isAvailable(Ljava/lang/String;)Z
		Landroid/filterfw/core/Filter;->setInputValue(Ljava/lang/String;Ljava/lang/Object;)V

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.ddm;

		import android.annotation.UnsupportedAppUsage;
		import org.apache.harmony.dalvik.ddmc.Chunk;
		import org.apache.harmony.dalvik.ddmc.ChunkHandler;
		import org.apache.harmony.dalvik.ddmc.DdmServer;
		@@ -69,6 +70,7 @@ public class DdmHandleAppName extends ChunkHandler {
		* before or after DDMS connects. For the latter we need to send up
		* an APNM message.
		*/
		@UnsupportedAppUsage
		public static void setAppName(String name, int userId) {
		if (name == null \|\| name.length() == 0)
		return;
		@@ -79,6 +81,7 @@ public class DdmHandleAppName extends ChunkHandler {
		sendAPNM(name, userId);
		}

		@UnsupportedAppUsage
		public static String getAppName() {
		return mAppName;
		}