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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-19 20:56:45 +00:00
committed by Android (Google) Code Review
parent bf5506b240 12776ab723
commit fa54e4b62a
5 changed files with 5 additions and 8 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

@@ -26,10 +26,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Process.SYSTEM_UID; import static android.os.Process.SYSTEM_UID;
import android.Manifest.permission; import android.Manifest.permission;
import android.app.ActivityManager;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.ContentProviderHolder;
import android.app.IActivityManager;
import android.app.slice.ISliceManager; import android.app.slice.ISliceManager;
import android.app.slice.SliceSpec; import android.app.slice.SliceSpec;
import android.app.usage.UsageStatsManagerInternal; 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) { 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) { private String getProviderPkg(Uri uri, int user) {

2
services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java
View File

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

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

@@ -68,7 +68,7 @@ public class PinnedSliceStateTest extends UiServiceTestCase {
private IBinder mToken = new Binder(); private IBinder mToken = new Binder();
@Before @Before
public void setup() { public void setUp() {
mSliceService = mock(SliceManagerService.class); mSliceService = mock(SliceManagerService.class);
when(mSliceService.getContext()).thenReturn(mContext); when(mSliceService.getContext()).thenReturn(mContext);
when(mSliceService.getLock()).thenReturn(new Object()); when(mSliceService.getLock()).thenReturn(new Object());

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

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

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

@@ -71,7 +71,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase {
private TestableContext mContextSpy; private TestableContext mContextSpy;
@Before @Before
public void setup() { public void setUp() {
LocalServices.addService(UsageStatsManagerInternal.class, LocalServices.addService(UsageStatsManagerInternal.class,
mock(UsageStatsManagerInternal.class)); mock(UsageStatsManagerInternal.class));
mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class)); mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class));