Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 466e68ff authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Use correct package when pinning a slice" into pi-dev am: 79b9929f 

am: f3354a22

Change-Id: I9120570be63d0ceeac09aec81fc6371584e352ba
parents c3002d2e f3354a22

services/core/java/com/android/server/slice/SliceManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -155,11 +155,10 @@ public class SliceManagerService extends ISliceManager.Stub { 
        enforceAccess(pkg, uri);

        int user = Binder.getCallingUserHandle().getIdentifier();

        uri = maybeAddUserId(uri, user);

        getOrCreatePinnedSlice(uri, pkg).pin(pkg, specs, token);

        String slicePkg = getProviderPkg(uri, user);

        getOrCreatePinnedSlice(uri, slicePkg).pin(pkg, specs, token);



        Uri finalUri = uri;

        mHandler.post(() -> {

            String slicePkg = getProviderPkg(finalUri, user);

            if (slicePkg != null && !Objects.equals(pkg, slicePkg)) {

                mAppUsageStats.reportEvent(slicePkg, user,

                        isAssistant(pkg, user) || isDefaultHomeApp(pkg, user)

services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase { 


        mService.pinSlice("pkg", TEST_URI, EMPTY_SPECS, mToken);

        mService.pinSlice("pkg", TEST_URI, EMPTY_SPECS, mToken);

        verify(mService, times(1)).createPinnedSlice(eq(TEST_URI), eq("pkg"));

        verify(mService, times(1)).createPinnedSlice(eq(TEST_URI), anyString());

    }



    @Test