Merge cherrypicks of [16565827, 16572034, 16531386, 16600886, 16602652] into... (a84ea51e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsProviderLifecycleManager.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,12 @@ class ControlsProviderLifecycleManager(
		wrapper = null
		bindService(false)
		}

		override fun onNullBinding(name: ComponentName?) {
		if (DEBUG) Log.d(TAG, "onNullBinding $name")
		wrapper = null
		context.unbindService(this)
		}
		}

		private fun handlePendingServiceMethods() {

packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsProviderLifecycleManagerTest.kt

+41 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@
		package com.android.systemui.controls.controller

		import android.content.ComponentName
		import android.content.Context
		import android.content.Intent
		import android.content.ServiceConnection
		import android.os.UserHandle
		import android.service.controls.IControlsActionCallback
		import android.service.controls.IControlsProvider
		@@ -43,6 +46,8 @@ import org.mockito.ArgumentMatchers.eq
		import org.mockito.Captor
		import org.mockito.Mock
		import org.mockito.Mockito.`when`
		import org.mockito.Mockito.anyInt
		import org.mockito.Mockito.mock
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations
		@@ -57,8 +62,6 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		private lateinit var subscriberService: IControlsSubscriber.Stub
		@Mock
		private lateinit var service: IControlsProvider.Stub
		@Mock
		private lateinit var loadCallback: ControlsBindingController.LoadCallback

		@Captor
		private lateinit var wrapperCaptor: ArgumentCaptor<ControlActionWrapper>
		@@ -75,7 +78,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		fun setUp() {
		MockitoAnnotations.initMocks(this)

		mContext.addMockService(componentName, service)
		context.addMockService(componentName, service)
		executor = FakeExecutor(FakeSystemClock())
		`when`(service.asBinder()).thenCallRealMethod()
		`when`(service.queryLocalInterface(ArgumentMatchers.anyString())).thenReturn(service)
		@@ -98,7 +101,36 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		fun testBindService() {
		manager.bindService()
		executor.runAllReady()
		assertTrue(mContext.isBound(componentName))
		assertTrue(context.isBound(componentName))
		}

		@Test
		fun testNullBinding() {
		val mockContext = mock(Context::class.java)
		lateinit var serviceConnection: ServiceConnection
		`when`(mockContext.bindServiceAsUser(any(), any(), anyInt(), any())).thenAnswer {
		val component = (it.arguments[0] as Intent).component
		if (component == componentName) {
		serviceConnection = it.arguments[1] as ServiceConnection
		serviceConnection.onNullBinding(component)
		true
		} else {
		false
		}
		}

		val nullManager = ControlsProviderLifecycleManager(
		mockContext,
		executor,
		actionCallbackService,
		UserHandle.of(0),
		componentName
		)

		nullManager.bindService()
		executor.runAllReady()

		verify(mockContext).unbindService(serviceConnection)
		}

		@Test
		@@ -109,7 +141,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		manager.unbindService()
		executor.runAllReady()

		assertFalse(mContext.isBound(componentName))
		assertFalse(context.isBound(componentName))
		}

		@Test
		@@ -119,7 +151,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {

		verify(service).load(subscriberService)

		assertTrue(mContext.isBound(componentName))
		assertTrue(context.isBound(componentName))
		}

		@Test
		@@ -129,7 +161,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {

		manager.unbindService()
		executor.runAllReady()
		assertFalse(mContext.isBound(componentName))
		assertFalse(context.isBound(componentName))
		}

		@Test
		@@ -162,7 +194,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		manager.maybeBindAndSubscribe(list, subscriberService)
		executor.runAllReady()

		assertTrue(mContext.isBound(componentName))
		assertTrue(context.isBound(componentName))
		verify(service).subscribe(list, subscriberService)
		}

		@@ -173,7 +205,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
		manager.maybeBindAndSendAction(controlId, action)
		executor.runAllReady()

		assertTrue(mContext.isBound(componentName))
		assertTrue(context.isBound(componentName))
		verify(service).action(eq(controlId), capture(wrapperCaptor),
		eq(actionCallbackService))
		assertEquals(action, wrapperCaptor.getValue().getWrappedAction())

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2470,7 +2470,7 @@ public class NotificationManagerService extends SystemService {
		}
		}

		private void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,
		void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,
		boolean fromApp, boolean fromListener) {
		Objects.requireNonNull(group);
		Objects.requireNonNull(pkg);
		@@ -3488,7 +3488,8 @@ public class NotificationManagerService extends SystemService {

		final int callingUid = Binder.getCallingUid();
		NotificationChannelGroup groupToDelete =
		mPreferencesHelper.getNotificationChannelGroup(groupId, pkg, callingUid);
		mPreferencesHelper.getNotificationChannelGroupWithChannels(
		pkg, callingUid, groupId, false);
		if (groupToDelete != null) {
		// Preflight for allowability
		final int userId = UserHandle.getUserId(callingUid);

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,11 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		if (age >= MAX_SESSION_AGE_ON_LOW_STORAGE_MILLIS) {
		// Aggressively close old sessions because we are running low on storage
		// Their staging dirs will be removed too
		session.abandon();
		PackageInstallerSession root = !session.hasParentSessionId()
		? session : mSessions.get(session.getParentSessionId());
		if (!root.isDestroyed()) {
		root.abandon();
		}
		} else {
		// Session is new enough, so it deserves to be kept even on low storage
		unclaimedStagingDirsOnVolume.remove(session.stageDir);

services/core/java/com/android/server/pm/permission/BasePermission.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,8 @@ public final class BasePermission {
		}
		if (bp.perm != null && Objects.equals(bp.perm.getPackageName(), p.getPackageName())
		&& Objects.equals(bp.perm.getName(), p.getName())) {
		bp.perm.setFlags(bp.perm.getFlags() & ~PermissionInfo.FLAG_INSTALLED);
		bp.perm = p.setFlags(p.getFlags() \| PermissionInfo.FLAG_INSTALLED);
		bp.protectionLevel = p.getProtectionLevel();
		}
		if (bp.isRuntime() && (ownerChanged \|\| wasNonRuntime)) {