Merge "Fixing wrong arguments used for permission check" into qt-dev (fa54e4b6) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -26,10 +26,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.Process.SYSTEM_UID;

		import android.Manifest.permission;
		import android.app.ActivityManager;
		import android.app.AppOpsManager;
		import android.app.ContentProviderHolder;
		import android.app.IActivityManager;
		import android.app.slice.ISliceManager;
		import android.app.slice.SliceSpec;
		import android.app.usage.UsageStatsManagerInternal;
		@@ -391,7 +388,7 @@ public class SliceManagerService extends ISliceManager.Stub {
		}

		protected int checkAccess(String pkg, Uri uri, int uid, int pid) {
		return checkSlicePermission(uri, null, pkg, uid, pid, null);
		return checkSlicePermission(uri, null, pkg, pid, uid, null);
		}

		private String getProviderPkg(Uri uri, int user) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public class UiServiceTestCase {
		}

		@Before
		public void setup() {
		public final void setup() {
		MockitoAnnotations.initMocks(this);

		// Share classloader to allow package access.

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public class PinnedSliceStateTest extends UiServiceTestCase {
		private IBinder mToken = new Binder();

		@Before
		public void setup() {
		public void setUp() {
		mSliceService = mock(SliceManagerService.class);
		when(mSliceService.getContext()).thenReturn(mContext);
		when(mSliceService.getLock()).thenReturn(new Object());

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public class SliceFullAccessListTest extends UiServiceTestCase {
		private SliceFullAccessList mAccessList;

		@Before
		public void setup() {
		public void setUp() {
		mAccessList = new SliceFullAccessList(mContext);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase {
		private TestableContext mContextSpy;

		@Before
		public void setup() {
		public void setUp() {
		LocalServices.addService(UsageStatsManagerInternal.class,
		mock(UsageStatsManagerInternal.class));
		mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class));