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

Commit e06b4d1d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Consistent naming for PackageManager methods. 

When hidden PackageManager methods take a userId argument, they
should be named explicitly with the "AsUser" suffix.  This fixes
several lagging examples so that we can pave the way to safely
start passing flags to new methods without scary overloading.

Also fix spacing issues in various logging statements.

Change-Id: I1e42f7f66427410275df713bea04f6e0445fba28
parent 2a90f673

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -36743,7 +36743,6 @@ package android.test.mock { 
    method public android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int getComponentEnabledSetting(android.content.ComponentName);

    method public android.graphics.drawable.Drawable getDefaultActivityIcon();

    method public java.lang.String getDefaultBrowserPackageName(int);

    method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public byte[] getEphemeralCookie();

    method public int getEphemeralCookieMaxSizeBytes();
@@ -36795,7 +36794,6 @@ package android.test.mock { 
    method public android.content.pm.ResolveInfo resolveService(android.content.Intent, int);

    method public void setApplicationEnabledSetting(java.lang.String, int, int);

    method public void setComponentEnabledSetting(android.content.ComponentName, int, int);

    method public boolean setDefaultBrowserPackageName(java.lang.String, int);

    method public boolean setEphemeralCookie(byte[]);

    method public void setInstallerPackageName(java.lang.String, java.lang.String);

    method public void verifyPendingInstall(int, int);

api/removed.txt

+9 −0
Original line number Diff line number Diff line
@@ -199,6 +199,15 @@ package android.provider { 


}



package android.test.mock {



  public class MockPackageManager extends android.content.pm.PackageManager {

    method public deprecated java.lang.String getDefaultBrowserPackageName(int);

    method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);

  }



}



package android.text.format {



  public class DateFormat {

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -39084,7 +39084,6 @@ package android.test.mock { 
    method public android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int getComponentEnabledSetting(android.content.ComponentName);

    method public android.graphics.drawable.Drawable getDefaultActivityIcon();

    method public java.lang.String getDefaultBrowserPackageName(int);

    method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public byte[] getEphemeralCookie();

    method public int getEphemeralCookieMaxSizeBytes();
@@ -39140,7 +39139,6 @@ package android.test.mock { 
    method public void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    method public void setApplicationEnabledSetting(java.lang.String, int, int);

    method public void setComponentEnabledSetting(android.content.ComponentName, int, int);

    method public boolean setDefaultBrowserPackageName(java.lang.String, int);

    method public boolean setEphemeralCookie(byte[]);

    method public void setInstallerPackageName(java.lang.String, java.lang.String);

    method public void updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);

api/system-removed.txt

+9 −0
Original line number Diff line number Diff line
@@ -190,6 +190,15 @@ package android.provider { 


}



package android.test.mock {



  public class MockPackageManager extends android.content.pm.PackageManager {

    method public deprecated java.lang.String getDefaultBrowserPackageName(int);

    method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);

  }



}



package android.text.format {



  public class DateFormat {

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -36746,7 +36746,6 @@ package android.test.mock { 
    method public android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int getComponentEnabledSetting(android.content.ComponentName);

    method public android.graphics.drawable.Drawable getDefaultActivityIcon();

    method public java.lang.String getDefaultBrowserPackageName(int);

    method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public byte[] getEphemeralCookie();

    method public int getEphemeralCookieMaxSizeBytes();
@@ -36798,7 +36797,6 @@ package android.test.mock { 
    method public android.content.pm.ResolveInfo resolveService(android.content.Intent, int);

    method public void setApplicationEnabledSetting(java.lang.String, int, int);

    method public void setComponentEnabledSetting(android.content.ComponentName, int, int);

    method public boolean setDefaultBrowserPackageName(java.lang.String, int);

    method public boolean setEphemeralCookie(byte[]);

    method public void setInstallerPackageName(java.lang.String, java.lang.String);

    method public void verifyPendingInstall(int, int);