Merge "Fixing wrong arguments used for permission check" into qt-dev

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

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

services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java

@@ -49,7 +49,7 @@ public class UiServiceTestCase {
     }
 
     @Before
-    public void setup() {
+    public final void setup() {
         MockitoAnnotations.initMocks(this);
 
         // Share classloader to allow package access.

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

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

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

@@ -47,7 +47,7 @@ public class SliceFullAccessListTest extends UiServiceTestCase {
     private SliceFullAccessList mAccessList;
 
     @Before
-    public void setup() {
+    public void setUp() {
         mAccessList = new SliceFullAccessList(mContext);
     }
 

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

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