Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct package when pinning a slice" into pi-dev

Browse Source 
am: 79b9929f58

Change-Id: Idbdf08e1a453a83bf1d8dc46750b16887a6f1493
This commit is contained in:
Jason Monk
2018-04-26 11:56:44 -07:00
committed by android-build-merger
parent 904e3349a6 79b9929f58
commit f3354a2209
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/slice/SliceManagerService.java
View File

@@ -155,11 +155,10 @@ public class SliceManagerService extends ISliceManager.Stub {
enforceAccess(pkg, uri); enforceAccess(pkg, uri);
int user = Binder.getCallingUserHandle().getIdentifier(); int user = Binder.getCallingUserHandle().getIdentifier();
uri = maybeAddUserId(uri, user); 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(() -> { mHandler.post(() -> {
String slicePkg = getProviderPkg(finalUri, user);
if (slicePkg != null && !Objects.equals(pkg, slicePkg)) { if (slicePkg != null && !Objects.equals(pkg, slicePkg)) {
mAppUsageStats.reportEvent(slicePkg, user, mAppUsageStats.reportEvent(slicePkg, user,
isAssistant(pkg, user) || isDefaultHomeApp(pkg, user) isAssistant(pkg, user) || isDefaultHomeApp(pkg, user)

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

@@ -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);
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 @Test
@@ -126,4 +126,4 @@ public class SliceManagerServiceTest extends UiServiceTestCase {
verify(mContextSpy).checkPermission(eq("perm2"), eq(Process.myPid()), eq(Process.myUid())); verify(mContextSpy).checkPermission(eq("perm2"), eq(Process.myPid()), eq(Process.myUid()));
} }
} }