Merge "Fix crash in permission grant screen." into qt-dev (0b5be020) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -265,6 +265,19 @@ public class GrantPermissionsActivity extends Activity

		setTitle(R.string.permission_request_title);

		mRequestedPermissions = getIntent().getStringArrayExtra(
		PackageManager.EXTRA_REQUEST_PERMISSIONS_NAMES);
		if (mRequestedPermissions == null) {
		mRequestedPermissions = new String[0];
		}

		final int requestedPermCount = mRequestedPermissions.length;

		if (requestedPermCount == 0) {
		setResultAndFinish();
		return;
		}

		PackageInfo callingPackageInfo = getCallingPackageInfo();

		if (callingPackageInfo == null \|\| callingPackageInfo.requestedPermissions == null
		@@ -273,6 +286,14 @@ public class GrantPermissionsActivity extends Activity
		return;
		}

		// Don't allow legacy apps to request runtime permissions.
		if (callingPackageInfo.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
		// Returning empty arrays means a cancellation.
		mRequestedPermissions = new String[0];
		setResultAndFinish();
		return;
		}

		mCallingUid = callingPackageInfo.applicationInfo.uid;

		UserHandle userHandle = UserHandle.getUserHandleForUid(mCallingUid);
		@@ -292,27 +313,6 @@ public class GrantPermissionsActivity extends Activity
		.setResultListener(this);
		}

		mRequestedPermissions = getIntent().getStringArrayExtra(
		PackageManager.EXTRA_REQUEST_PERMISSIONS_NAMES);
		if (mRequestedPermissions == null) {
		mRequestedPermissions = new String[0];
		}

		final int requestedPermCount = mRequestedPermissions.length;

		if (requestedPermCount == 0) {
		setResultAndFinish();
		return;
		}

		// Don't allow legacy apps to request runtime permissions.
		if (callingPackageInfo.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
		// Returning empty arrays means a cancellation.
		mRequestedPermissions = new String[0];
		setResultAndFinish();
		return;
		}

		mAppPermissions = new AppPermissions(this, callingPackageInfo, false,
		new Runnable() {
		@Override