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

Commit fd71d25e authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Update some in-procss APIs to system APIs" am: a7f149d8 am: f0b1601c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c2cb79d321d3e5ae686cb9ba682e600df392be0
parents ce2767bd f0b1601c

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1874,6 +1874,9 @@ package android.content.pm { 
  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    method public boolean isEncryptionAware();

    method public boolean isInstantApp();

    method public boolean isOem();

    method public boolean isProduct();

    method public boolean isVendor();

    field public String credentialProtectedDataDir;

    field public int targetSandboxVersion;

  }

core/java/android/content/pm/ApplicationInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -2101,7 +2101,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    }



    /** @hide */

    @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    @SystemApi

    public boolean isOem() {

        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_OEM) != 0;

    }
@@ -2149,13 +2149,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    }



    /** @hide */

    @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    @SystemApi

    public boolean isVendor() {

        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_VENDOR) != 0;

    }



    /** @hide */

    @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    @SystemApi

    public boolean isProduct() {

        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PRODUCT) != 0;

    }