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

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;

                    .detectAll()

                    .penaltyDeath()

                    .build());

            return onBindSlice(sliceUri, supportedSpecs);

            return onBindSlice(sliceUri, new ArraySet<>(supportedSpecs));

        } finally {

            StrictMode.setThreadPolicy(oldPolicy);

        }

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;

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;

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;

    @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));

                    }

                }

            }

        }