Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ApplicationInfo.usesNonSdkApi to private flags"

Browse Source 
am: fdd378c594

Change-Id: I43fe6b903eb4cd900da9ebc2b10893213329c691
This commit is contained in:
David Brazdil
2018-09-07 03:12:59 -07:00
committed by android-build-merger
parent 5c776dea7e fdd378c594
commit de5cc1ff5b
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -621,6 +621,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
*/
public static final int PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY = 1 << 20;
/**
* Indicates whether this package requires access to non-SDK APIs.
* Only system apps and tests are allowed to use this property.
* @hide
*/
public static final int PRIVATE_FLAG_USES_NON_SDK_API = 1 << 22;
/** @hide */
@IntDef(flag = true, prefix = { "PRIVATE_FLAG_" }, value = {
PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE,
@@ -1000,13 +1007,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
*/
public String appComponentFactory;
/**
* Indicates whether this package requires access to non-SDK APIs. Only system apps
* and tests are allowed to use this property.
* @hide
*/
public boolean usesNonSdkApi;
/**
* The category of this app. Categories are used to cluster multiple apps
* together into meaningful groups, such as when summarizing battery,
@@ -1286,6 +1286,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
pw.println(prefix + "category=" + category);
}
pw.println(prefix + "HiddenApiEnforcementPolicy=" + getHiddenApiEnforcementPolicy());
pw.println(prefix + "usesNonSdkApi=" + usesNonSdkApi());
}
super.dumpBack(pw, prefix);
}
@@ -1710,11 +1711,18 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
return SystemConfig.getInstance().getHiddenApiWhitelistedApps().contains(packageName);
}
/**
* @hide
*/
public boolean usesNonSdkApi() {
return (privateFlags & PRIVATE_FLAG_USES_NON_SDK_API) != 0;
}
private boolean isAllowedToUseHiddenApis() {
if (isSignedWithPlatformKey()) {
return true;
} else if (isSystemApp() || isUpdatedSystemApp()) {
return usesNonSdkApi || isPackageWhitelistedForHiddenApis();
return usesNonSdkApi() || isPackageWhitelistedForHiddenApis();
} else {
return false;
}

6
core/java/android/content/pm/PackageParser.java
View File

@@ -3588,8 +3588,10 @@ public class PackageParser {
ai.appComponentFactory = buildClassName(ai.packageName, factory, outError);
}
ai.usesNonSdkApi = sa.getBoolean(
com.android.internal.R.styleable.AndroidManifestApplication_usesNonSdkApi, false);
if (sa.getBoolean(
com.android.internal.R.styleable.AndroidManifestApplication_usesNonSdkApi, false)) {
ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_USES_NON_SDK_API;
}
if (outError[0] == null) {
CharSequence pname;

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -21999,7 +21999,7 @@ public class ActivityManagerService extends IActivityManager.Stub
activeInstr.mUiAutomationConnection = uiAutomationConnection;
activeInstr.mResultClass = className;
boolean disableHiddenApiChecks = ai.usesNonSdkApi
boolean disableHiddenApiChecks = ai.usesNonSdkApi()
|| (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;
if (disableHiddenApiChecks) {
enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS,