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

Merge "Fix pinned slices returning different Uris." into pi-dev

Browse Source 
am: b672c1f97c

Change-Id: If07c9fb4b3391cce7c555430ffb5b0fbdb760777
This commit is contained in:
Jason Monk
2018-04-12 20:03:23 -07:00
committed by android-build-merger
parent d4445cadbd b672c1f97c
commit 8e70dd482b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/slice/SliceProvider.java
View File

@@ -37,6 +37,7 @@ import android.os.Handler;
import android.os.Process;
import android.os.StrictMode;
import android.os.StrictMode.ThreadPolicy;
import android.util.ArraySet;
import android.util.Log;
import java.util.ArrayList;
@@ -513,7 +514,7 @@ public abstract class SliceProvider extends ContentProvider {
.detectAll()
.penaltyDeath()
.build());
return onBindSlice(sliceUri, supportedSpecs);
return onBindSlice(sliceUri, new ArraySet<>(supportedSpecs));
} finally {
StrictMode.setThreadPolicy(oldPolicy);
}

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

@@ -44,7 +44,6 @@ import android.content.pm.PackageManagerInternal;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -52,7 +51,6 @@ import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.AtomicFile;
import android.util.Slog;
import android.util.Xml.Encoding;
@@ -71,9 +69,7 @@ import org.xmlpull.v1.XmlSerializer;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -136,11 +132,16 @@ public class SliceManagerService extends ISliceManager.Stub {
@Override
public Uri[] getPinnedSlices(String pkg) {
verifyCaller(pkg);
int callingUser = Binder.getCallingUserHandle().getIdentifier();
ArrayList<Uri> ret = new ArrayList<>();
synchronized (mLock) {
for (PinnedSliceState state : mPinnedSlicesByUri.values()) {
if (Objects.equals(pkg, state.getPkg())) {
ret.add(state.getUri());
Uri uri = state.getUri();
int userId = ContentProvider.getUserIdFromUri(uri, callingUser);
if (userId == callingUser) {
ret.add(ContentProvider.getUriWithoutUserId(uri));
}
}
}
}