diff options
| author | 2023-01-20 12:53:30 +0000 | |
|---|---|---|
| committer | 2023-01-20 12:53:30 +0000 | |
| commit | ac5a42d65be402e27acce6ad8dfa732ec3a891fa (patch) | |
| tree | 5fef6f5a8cc9c4225e07284cd78b7853849140e4 | |
| parent | 9a3368f519a87c0b3c06d654a489e713c4961f79 (diff) | |
| parent | b5a25c14e262c06fda7ee3bd3f04588129588667 (diff) | |
Merge "Add @TestApi to Context.updateDeviceId"
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index f48cca354f9a..da9697b1fef4 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -759,6 +759,7 @@ package android.content { method public int getUserId(); method public void setAutofillOptions(@Nullable android.content.AutofillOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); + method public void updateDeviceId(int); field public static final String ATTENTION_SERVICE = "attention"; field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 53cc4cbafba7..5f1502fdcd63 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -7342,6 +7342,7 @@ public abstract class Context { * @see #createDeviceContext(int) * @hide */ + @TestApi public void updateDeviceId(int deviceId) { throw new RuntimeException("Not implemented. Must override in a subclass."); } |