Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bde7874 authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Update current.txt to fix inconsistencies"

parents c1209020 a23c70a4

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -57590,14 +57590,14 @@ package java.lang { 
    method public void setContextClassLoader(java.lang.ClassLoader);

    method public void setContextClassLoader(java.lang.ClassLoader);

    method public final void setDaemon(boolean);

    method public final void setDaemon(boolean);

    method public static void setDefaultUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler);

    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 final void setPriority(int);

    method public void setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler);

    method public void setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler);

    method public static void sleep(long) throws java.lang.InterruptedException;

    method public static void sleep(long) throws java.lang.InterruptedException;

    method public static void sleep(long, int) throws java.lang.InterruptedException;

    method public static void sleep(long, int) throws java.lang.InterruptedException;

    method public synchronized void start();

    method public synchronized void start();

    method public final deprecated void stop();

    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 final deprecated void suspend();

    method public static void yield();

    method public static void yield();

    field public static final int MAX_PRIORITY = 10; // 0xa

    field public static final int MAX_PRIORITY = 10; // 0xa

api/test-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -256,8 +256,8 @@ package android.content.pm { 
  public abstract class PackageManager {

  public abstract class PackageManager {

    method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);

    method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);

    method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);

    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.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[] getNamesForUids(int[]);

    method public abstract java.lang.String getPermissionControllerPackageName();

    method public abstract java.lang.String getPermissionControllerPackageName();

    method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();

    method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();