Merge "Fix merge conflicts between AOSP, pi-dev." into pi-dev-plus-aosp (f81370c9) · Commits · e / os / android_frameworks_base

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -1702,33 +1702,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		}
		}

		private boolean isPackageWhitelistedForHiddenApis() {
		return SystemConfig.getInstance().getHiddenApiWhitelistedApps().contains(packageName);
		}

		/**
		* @hide
		*/
		public @HiddenApiEnforcementPolicy int getHiddenApiEnforcementPolicy() {
		if (mHiddenApiPolicy != HIDDEN_API_ENFORCEMENT_DEFAULT) {
		return mHiddenApiPolicy;
		}
		if (isPackageWhitelistedForHiddenApis() && (isSystemApp() \|\| isUpdatedSystemApp())) {
		return HIDDEN_API_ENFORCEMENT_NONE;
		}
		return HIDDEN_API_ENFORCEMENT_BLACK;
		}

		/**
		* @hide
		*/
		public void setHiddenApiEnforcementPolicy(@HiddenApiEnforcementPolicy int policy) {
		if (!isValidHiddenApiEnforcementPolicy(policy)) {
		throw new IllegalArgumentException("Invalid API enforcement policy: " + policy);
		}
		mHiddenApiPolicy = policy;
		}

		/** @hide */
		public boolean isDefaultToDeviceProtectedStorage() {
		return (privateFlags