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

Merge "Grant location to default launcher" into oc-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2017-08-29 00:47:25 +00:00
committed by Android (Google) Code Review
parent 61492c85ba 5bb6bc6e52
commit 25e5a3446e
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/Intent.java
View File

@@ -3954,6 +3954,16 @@ public class Intent implements Parcelable, Cloneable {
*/
@SdkConstant(SdkConstantType.INTENT_CATEGORY)
public static final String CATEGORY_SETUP_WIZARD = "android.intent.category.SETUP_WIZARD";
/**
* This is the home activity, that is the activity that serves as the launcher app
* from there the user can start other apps. Often components with lower/higher
* priority intent filters handle the home intent, for example SetupWizard, to
* setup the device and we need to be able to distinguish the home app from these
* setup helpers.
* @hide
*/
@SdkConstant(SdkConstantType.INTENT_CATEGORY)
public static final String CATEGORY_LAUNCHER_APP = "android.intent.category.LAUNCHER_APP";
/**
* This activity is a preference panel.
*/

17
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
View File

@@ -624,14 +624,25 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
}
// Home
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
homeIntent.addCategory(Intent.CATEGORY_HOME);
homeIntent.addCategory(Intent.CATEGORY_LAUNCHER_APP);
PackageParser.Package homePackage = getDefaultSystemHandlerActivityPackageLPr(
homeIntent, userId);
if (homePackage != null
&& doesPackageSupportRuntimePermissions(homePackage)) {
grantRuntimePermissionsLPw(homePackage, LOCATION_PERMISSIONS, false, userId);
}
// Watches
if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH, 0)) {
// Home application on watches
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
Intent wearHomeIntent = new Intent(Intent.ACTION_MAIN);
wearHomeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
PackageParser.Package wearHomePackage = getDefaultSystemHandlerActivityPackageLPr(
homeIntent, userId);
wearHomeIntent, userId);
if (wearHomePackage != null
&& doesPackageSupportRuntimePermissions(wearHomePackage)) {