From a23c70a4027ba91ee651220afcd0009cb86f0e7f Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Thu, 9 Aug 2018 17:34:18 -0700 Subject: [PATCH] Update current.txt to fix inconsistencies A couple minor signature changes seem to have been missed, causing cruft to appear in API changes by others. This is a little cleanup to ensure that API updates are clean in current.txt Bug: 112441667 Test: compilation Change-Id: I1d24ec53d180eb6451fef6d76cd22f1956bd7f7d --- api/current.txt | 4 ++-- api/test-current.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 139776b4b93da..4ec226506f79d 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 4c3c0f8625d9a..8073341ebad17 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 getInstalledPackagesAsUser(int, int); method public abstract java.util.List getInstalledApplicationsAsUser(int, int); + method public abstract java.util.List 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();