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

Merge "Give Android Wear system apps default permission" into cw-e-dev

Browse Source
This commit is contained in:
Anthony Hugh
2015-10-09 18:26:56 +00:00
committed by Android (Google) Code Review
parent 8550261afb 979b81ac33
commit 6b566ec5fd
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3156,6 +3156,13 @@ public class Intent implements Parcelable, Cloneable {
*/ */
@SdkConstant(SdkConstantType.INTENT_CATEGORY) @SdkConstant(SdkConstantType.INTENT_CATEGORY)
public static final String CATEGORY_HOME = "android.intent.category.HOME"; public static final String CATEGORY_HOME = "android.intent.category.HOME";
/**
* This is the home activity that is displayed when the device is finished setting up and ready
* for use.
* @hide
*/
@SdkConstant(SdkConstantType.INTENT_CATEGORY)
public static final String CATEGORY_HOME_MAIN = "android.intent.category.HOME_MAIN";
/** /**
* This is the setup wizard activity, that is the first activity that is displayed * This is the setup wizard activity, that is the first activity that is displayed
* when the user sets up the device for the first time. * when the user sets up the device for the first time.

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

@@ -571,6 +571,24 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId); grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
} }
// Android Wear Home
if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
PackageParser.Package wearHomePackage = getDefaultSystemHandlerActivityPackageLPr(
homeIntent, userId);
if (wearHomePackage != null
&& doesPackageSupportRuntimePermissions(wearHomePackage)) {
grantRuntimePermissionsLPw(wearHomePackage, CONTACTS_PERMISSIONS, false,
userId);
grantRuntimePermissionsLPw(wearHomePackage, PHONE_PERMISSIONS, true, userId);
grantRuntimePermissionsLPw(wearHomePackage, MICROPHONE_PERMISSIONS, false,
userId);
}
}
mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId); mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
} }
} }