resolve merge conflicts of 3629c67 to master (644cc7d5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,8 @@ final class DefaultPermissionGrantPolicy {

		private static final int MSG_READ_DEFAULT_PERMISSION_EXCEPTIONS = 1;

		private static final String ACTION_TRACK = "com.android.fitness.TRACK";

		private final PackageManagerService mService;
		private final Handler mHandler;

		@@ -603,8 +605,9 @@ final class DefaultPermissionGrantPolicy {
		grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
		}

		// Android Wear Home
		// Watches
		if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH, 0)) {
		// Home application on watches
		Intent homeIntent = new Intent(Intent.ACTION_MAIN);
		homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);

		@@ -621,6 +624,16 @@ final class DefaultPermissionGrantPolicy {
		grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,
		userId);
		}

		// Fitness tracking on watches
		Intent trackIntent = new Intent(ACTION_TRACK);
		PackageParser.Package trackPackage = getDefaultSystemHandlerActivityPackageLPr(
		trackIntent, userId);
		if (trackPackage != null
		&& doesPackageSupportRuntimePermissions(trackPackage)) {
		grantRuntimePermissionsLPw(trackPackage, SENSORS_PERMISSIONS, false, userId);
		grantRuntimePermissionsLPw(trackPackage, LOCATION_PERMISSIONS, false, userId);
		}
		}

		// Print Spooler