Snap for 6314400 from 94ba6093071b44d1faafc81e0d6d5f0163cf1e1d to rvc-release (cc8b74fa) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Random;
		import java.util.Set;
		import java.util.concurrent.Executor;
		import java.util.function.Consumer;
		import java.util.function.IntConsumer;

		@@ -620,11 +621,14 @@ public final class PermissionControllerServiceImpl extends PermissionControllerL
		}

		@Override
		public void onUpdateUserSensitivePermissionFlags(int uid, Runnable callback) {
		public void onUpdateUserSensitivePermissionFlags(int uid, Executor executor,
		Runnable callback) {
		if (uid == Process.INVALID_UID) {
		UserSensitiveFlagsUtils.updateUserSensitiveForUser(Process.myUserHandle(), callback);
		UserSensitiveFlagsUtils.updateUserSensitiveForUser(Process.myUserHandle(),
		() -> executor.execute(callback));
		} else {
		UserSensitiveFlagsUtils.updateUserSensitiveForUid(uid, callback);
		UserSensitiveFlagsUtils.updateUserSensitiveForUid(uid,
		() -> executor.execute(callback));
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader {

		private AppPermissionGroupsViewModel mViewModel;
		private boolean mIsSystemPermsScreen;
		private boolean mIsFirstLoad;
		private String mPackageName;
		private UserHandle mUser;

		@@ -159,7 +160,6 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader {
		if (mViewModel.getPackagePermGroupsLiveData().getValue() != null) {
		updatePreferences(mViewModel.getPackagePermGroupsLiveData().getValue());
		}
		logAppPermissionsFragmentView();
		}

		@Override
		@@ -296,6 +296,11 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader {
		}

		setAutoRevokeToggleState(mViewModel.getAutoRevokeLiveData().getValue());

		if (mIsFirstLoad) {
		logAppPermissionsFragmentView();
		mIsFirstLoad = false;
		}
		}

		private void addAutoRevokePreferences(PreferenceScreen screen) {