diff options
| author | 2018-08-13 10:19:51 -0700 | |
|---|---|---|
| committer | 2018-08-13 10:19:51 -0700 | |
| commit | 1a1f74af2f6f7003393b9184dedf17f59bb49a55 (patch) | |
| tree | 385617dfe09f7ef58514d642162125146856c1b7 | |
| parent | 228ee3501feb055db07386b91d88b75be2adc7d8 (diff) | |
| parent | 6d154cf7f05a3e16591a7cfa15e70230d1809c3a (diff) | |
Merge "Update current.txt to fix inconsistencies" am: 0bde7874cc am: f4e432ad76
am: 6d154cf7f0
Change-Id: I6d5d96898b8e7a115d8d3ebe627c8d026ef1da30
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 139776b4b93d..4ec226506f79 100644 --- a/api/current.txt +++ b/api/current.txt @@ -57590,14 +57590,14 @@ package java.lang { method public void setContextClassLoader(java.lang.ClassLoader); method public final void setDaemon(boolean); method public static void setDefaultUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler); - method public final void setName(java.lang.String); + method public final synchronized void setName(java.lang.String); method public final void setPriority(int); method public void setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler); method public static void sleep(long) throws java.lang.InterruptedException; method public static void sleep(long, int) throws java.lang.InterruptedException; method public synchronized void start(); method public final deprecated void stop(); - method public final deprecated void stop(java.lang.Throwable); + method public final deprecated synchronized void stop(java.lang.Throwable); method public final deprecated void suspend(); method public static void yield(); field public static final int MAX_PRIORITY = 10; // 0xa diff --git a/api/test-current.txt b/api/test-current.txt index 4c3c0f8625d9..8073341ebad1 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -256,8 +256,8 @@ package android.content.pm { public abstract class PackageManager { method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int); method public abstract int getInstallReason(java.lang.String, android.os.UserHandle); - method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int); method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int); + method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int); method public abstract java.lang.String[] getNamesForUids(int[]); method public abstract java.lang.String getPermissionControllerPackageName(); method public abstract java.lang.String getServicesSystemSharedLibraryPackageName(); |