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

Commit 8a72d5a9 authored Feb 01, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Feb 01, 2019

Merge "Add a new "appPredictor" protection flag."

parents 56a967e1 cd7695dd

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1640,6 +1640,7 @@ package android.content.pm {

		public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		field public static final int FLAG_REMOVED = 2; // 0x2
		field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000
		field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
		field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
		field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -521,6 +521,7 @@ package android.content.pm {
		}

		public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000
		field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
		field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
		field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000

core/java/android/app/ApplicationPackageManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -3016,6 +3016,15 @@ public class ApplicationPackageManager extends PackageManager {
		}
		}

		@Override
		public String getAppPredictionServicePackageName() {
		try {
		return mPM.getAppPredictionServicePackageName();
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		}
		}

		@Override
		public String getContentCaptureServicePackageName() {
		try {

core/java/android/content/pm/IPackageManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -686,6 +686,8 @@ interface IPackageManager {

		String getWellbeingPackageName();

		String getAppPredictionServicePackageName();

		String getContentCaptureServicePackageName();

		String getIncidentReportApproverPackageName();

core/java/android/content/pm/PackageManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -6724,6 +6724,16 @@ public abstract class PackageManager {
		"getWellbeingPackageName not implemented in subclass");
		}

		/**
		* @return the system defined app predictor package name, or null if there's none.
		*
		* @hide
		*/
		public String getAppPredictionServicePackageName() {
		throw new UnsupportedOperationException(
		"getAppPredictionServicePackageName not implemented in subclass");
		}

		/**
		* @return the system defined content capture service package name, or null if there's none.
		*