Merge "Check for permissions after checking for features." into cw-f-dev (a0b2858b) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/wear/WearPackageInstallerService.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -298,16 +298,6 @@ public class WearPackageInstallerService extends Service {
		}
		}

		// Check permissions on both the new wearable package and also on the already installed
		// wearable package.
		// If the app is targeting API level 23, we will also start a service in ClockworkHome
		// which will ultimately prompt the user to accept/reject permissions.
		if (checkPerms && !checkPermissions(pkg, companionSdkVersion, companionDeviceVersion,
		permUri, wearablePerms, tempFile)) {
		Log.w(TAG, "Wearable does not have enough permissions.");
		return;
		}

		// Check that the wearable has all the features.
		boolean hasAllFeatures = true;
		if (pkg.reqFeatures != null) {
		@@ -325,6 +315,16 @@ public class WearPackageInstallerService extends Service {
		return;
		}

		// Check permissions on both the new wearable package and also on the already installed
		// wearable package.
		// If the app is targeting API level 23, we will also start a service in ClockworkHome
		// which will ultimately prompt the user to accept/reject permissions.
		if (checkPerms && !checkPermissions(pkg, companionSdkVersion, companionDeviceVersion,
		permUri, wearablePerms, tempFile)) {
		Log.w(TAG, "Wearable does not have enough permissions.");
		return;
		}

		// Finally install the package.
		ParcelFileDescriptor fd = getContentResolver().openFileDescriptor(assetUri, "r");
		PackageInstallerFactory.getPackageInstaller(this).install(packageName, fd,