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

Merge "Allow recents component to launch non-exported activities" into pi-dev

Browse Source 
am: 037834d557

Change-Id: I0696f06e719b62dd79794176f4319b8dc636657a
This commit is contained in:
Winson Chung
2018-05-15 21:53:06 -07:00
committed by android-build-merger
parent 10e86d9f2f 037834d557
commit 11d224f7b4
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1702,11 +1702,16 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
boolean checkStartAnyActivityPermission(Intent intent, ActivityInfo aInfo,
String resultWho, int requestCode, int callingPid, int callingUid,
String callingPackage, boolean ignoreTargetSecurity, ProcessRecord callerApp,
ActivityRecord resultRecord, ActivityStack resultStack) {
String callingPackage, boolean ignoreTargetSecurity, boolean launchingInTask,
ProcessRecord callerApp, ActivityRecord resultRecord, ActivityStack resultStack) {
final boolean isCallerRecents = mService.getRecentTasks() != null &&
mService.getRecentTasks().isCallerRecents(callingUid);
final int startAnyPerm = mService.checkPermission(START_ANY_ACTIVITY, callingPid,
callingUid);
if (startAnyPerm == PERMISSION_GRANTED) {
if (startAnyPerm == PERMISSION_GRANTED || (isCallerRecents && launchingInTask)) {
// If the caller has START_ANY_ACTIVITY, ignore all checks below. In addition, if the
// caller is the recents component and we are specifically starting an activity in an
// existing task, then also allow the activity to be fully relaunched.
return true;
}
final int componentRestriction = getComponentRestrictionForCallingPackage(

2
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -713,7 +713,7 @@ class ActivityStarter {
boolean abort = !mSupervisor.checkStartAnyActivityPermission(intent, aInfo, resultWho,
requestCode, callingPid, callingUid, callingPackage, ignoreTargetSecurity,
callerApp, resultRecord, resultStack);
inTask != null, callerApp, resultRecord, resultStack);
abort |= !mService.mIntentFirewall.checkStartActivity(intent, callingUid,
callingPid, resolvedType, aInfo.applicationInfo);

4
services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java
View File

@@ -243,7 +243,7 @@ public class ActivityStarterTests extends ActivityTestsBase {
if (containsConditions(preconditions,PRECONDITION_CANNOT_START_ANY_ACTIVITY)) {
doReturn(false).when(service.mStackSupervisor).checkStartAnyActivityPermission(
any(), any(), any(), anyInt(), anyInt(), anyInt(), any(),
anyBoolean(), any(), any(), any());
anyBoolean(), anyBoolean(), any(), any(), any());
}
try {
@@ -302,7 +302,7 @@ public class ActivityStarterTests extends ActivityTestsBase {
// always allow test to start activity.
doReturn(true).when(mService.mStackSupervisor).checkStartAnyActivityPermission(
any(), any(), any(), anyInt(), anyInt(), anyInt(), any(),
anyBoolean(), any(), any(), any());
anyBoolean(), anyBoolean(), any(), any(), any());
// instrument the stack and task used.
final ActivityStack stack = mService.mStackSupervisor.getDefaultDisplay().createStack(