diff options
| author | 2018-08-02 08:33:43 -0700 | |
|---|---|---|
| committer | 2018-08-02 08:33:43 -0700 | |
| commit | dc5ad0b6e6eef258296001c58117e401d5aaa315 (patch) | |
| tree | 1533fd1f141c6773afd61f69358055722f8784c6 | |
| parent | 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a (diff) | |
| parent | 3b89584a7e62f6438b9138a5120a9654865bfd72 (diff) | |
Merge "Add @UnsupportedAppUsage annotations"
am: 3b89584a7e
Change-Id: I65a52e7ed92b09f7bf5c83eb0007f217ee5eaf6b
| -rw-r--r-- | config/hiddenapi-light-greylist.txt | 2 | ||||
| -rw-r--r-- | core/java/android/ddm/DdmHandleAppName.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 549fa266e94d..20bc7fcedc28 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2050,8 +2050,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 diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java index 7e39e47cb952..956078772ca8 100644 --- a/core/java/android/ddm/DdmHandleAppName.java +++ b/core/java/android/ddm/DdmHandleAppName.java @@ -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; } |