From 32164bb807b758f0961ce346b26738254c7e9c9a Mon Sep 17 00:00:00 2001 From: paulhu Date: Wed, 18 Nov 2020 16:51:13 +0800 Subject: [PATCH] Update some in-procss APIs to system APIs In-process API only applies to code in frameworks/base/services so that CS mainline can't use these APIs. Thus, update these in-process APIs to system APIs to support CS mainline usage. Bug: 170593746 Test: atest FrameworksNetTests Change-Id: I4c7c1e71dcb6448aed0107768b4ba8eecd3e11f7 --- core/api/system-current.txt | 3 +++ core/java/android/content/pm/ApplicationInfo.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index de8e18046a39a..9a075b34c48aa 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1873,6 +1873,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; } diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 81d9b11bc644e..e32068fe4b397 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -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; }