Merge "Moved LRResolverRankerService to ExtServices, and added a permission to... (ee818768) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,7 @@ package android {
		field public static final java.lang.String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";
		field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
		field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
		field public static final java.lang.String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";
		field public static final java.lang.String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";
		field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR";
		field public static final java.lang.String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
		@@ -40770,6 +40771,7 @@ package android.service.resolver {
		method public void onPredictSharingProbabilities(java.util.List<android.service.resolver.ResolverTarget>);
		method public void onTrainRankingModel(java.util.List<android.service.resolver.ResolverTarget>, int);
		field public static final java.lang.String BIND_PERMISSION = "android.permission.BIND_RESOLVER_RANKER_SERVICE";
		field public static final java.lang.String HOLD_PERMISSION = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.resolver.ResolverRankerService";
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,12 @@ public abstract class ResolverRankerService extends Service {
		@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
		public static final String SERVICE_INTERFACE = "android.service.resolver.ResolverRankerService";

		/**
		* The permission that a service must hold. If the service does not hold the permission, the
		* system will skip that service.
		*/
		public static final String HOLD_PERMISSION = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";

		/**
		* The permission that a service must require to ensure that only Android system can bind to it.
		* If this permission is not enforced in the AndroidManifest of the service, the system will

+8 −0

Original line number	Diff line number	Diff line
		@@ -438,6 +438,14 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		+ " in the manifest.");
		continue;
		}
		if (PackageManager.PERMISSION_GRANTED != mPm.checkPermission(
		ResolverRankerService.HOLD_PERMISSION,
		resolveInfo.serviceInfo.packageName)) {
		Log.w(TAG, "ResolverRankerService " + componentName + " does not hold"
		+ " permission " + ResolverRankerService.HOLD_PERMISSION
		+ " - this service will not be queried for ResolverComparator.");
		continue;
		}
		} catch (NameNotFoundException e) {
		Log.e(TAG, "Could not look up service " + componentName
		+ "; component name not found");

+8 −8

Original line number	Diff line number	Diff line
		@@ -3182,6 +3182,14 @@
		<permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE"
		android:protectionLevel="signature" />

		<!-- @SystemApi Must be held by services that extend
		{@link android.service.resolver.ResolverRankerService}.
		<p>Protection level: signature\|privileged
		@hide
		-->
		<permission android:name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"
		android:protectionLevel="signature\|privileged" />

		<!-- @SystemApi Must be required by services that extend
		{@link android.service.resolver.ResolverRankerService}, to ensure that only the system can
		bind to them.
		@@ -3723,14 +3731,6 @@
		<service android:name="com.android.server.PreloadsFileCacheExpirationJobService"
		android:permission="android.permission.BIND_JOB_SERVICE" >
		</service>

		<service android:name="com.android.internal.app.LRResolverRankerService"
		android:permission="android.permission.BIND_RESOLVER_RANKER_SERVICE"
		android:priority="-1" >
		<intent-filter>
		<action android:name="android.service.resolver.ResolverRankerService" />
		</intent-filter>
		</service>
		</application>

		</manifest>

+4 −0

Original line number	Diff line number	Diff line
		@@ -357,4 +357,8 @@ applications that come with the platform
		<permission name="android.permission.CONTROL_VPN"/>
		</privapp-permissions>

		<privapp-permissions package="com.google.android.ext.services">
		<permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
		</privapp-permissions>

		</permissions>