Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev (03b5f128) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,6 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageManager.aidl \
		core/java/android/content/pm/IPackageMoveObserver.aidl \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/content/pm/IPackagesProvider.aidl \
		core/java/android/content/pm/IOnPermissionsChangeListener.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/ICameraService.aidl \

core/java/android/content/pm/IPackageManager.aidl

+2 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.content.pm.IPackageDeleteObserver2;
		import android.content.pm.IPackageDataObserver;
		import android.content.pm.IPackageMoveObserver;
		import android.content.pm.IPackageStatsObserver;
		import android.content.pm.IPackagesProvider;
		import android.content.pm.IOnPermissionsChangeListener;
		import android.content.pm.IntentFilterVerificationInfo;
		import android.content.pm.InstrumentationInfo;
		@@ -504,7 +503,7 @@ interface IPackageManager {
		void addOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);
		void removeOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);

		void grantDefaultPermissions(int userId);
		void setCarrierAppPackagesProvider(in IPackagesProvider provider);
		int getMountExternalMode(int uid);

		void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);
		}

core/java/android/content/pm/IPackagesProvider.aidl

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.content.pm;

		/** {@hide} */
		interface IPackagesProvider {
		String[] getPackages(int userId);
		}

core/java/android/content/pm/PackageManagerInternal.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,30 @@ public abstract class PackageManagerInternal {
		* @param provider The packages provider.
		*/
		public abstract void setVoiceInteractionPackagesProvider(PackagesProvider provider);

		/**
		* Sets the SMS packages provider.
		* @param provider The packages provider.
		*/
		public abstract void setSmsAppPackagesProvider(PackagesProvider provider);

		/**
		* Sets the dialer packages provider.
		* @param provider The packages provider.
		*/
		public abstract void setDialerAppPackagesProvider(PackagesProvider provider);

		/**
		* Requests granting of the default permissions to the current default SMS app.
		* @param packageName The default SMS package name.
		* @param userId The user for which to grant the permissions.
		*/
		public abstract void grantDefaultPermissionsToDefaultSmsApp(String packageName, int userId);

		/**
		* Requests granting of the default permissions to the current default dialer app.
		* @param packageName The default dialer package name.
		* @param userId The user for which to grant the permissions.
		*/
		public abstract void grantDefaultPermissionsToDefaultDialerApp(String packageName, int userId);
		}

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+119 −53

Original line number	Diff line number	Diff line
		@@ -143,7 +143,8 @@ final class DefaultPermissionGrantPolicy {
		private PackagesProvider mImePackagesProvider;
		private PackagesProvider mLocationPackagesProvider;
		private PackagesProvider mVoiceInteractionPackagesProvider;
		private PackagesProvider mCarrierAppPackagesProvider;
		private PackagesProvider mSmsAppPackagesProvider;
		private PackagesProvider mDialerAppPackagesProvider;

		public DefaultPermissionGrantPolicy(PackageManagerService service) {
		mService = service;
		@@ -161,8 +162,12 @@ final class DefaultPermissionGrantPolicy {
		mVoiceInteractionPackagesProvider = provider;
		}

		public void setCarrierAppPackagesProviderLPw(PackagesProvider provider) {
		mCarrierAppPackagesProvider = provider;
		public void setSmsAppPackagesProviderLPw(PackagesProvider provider) {
		mSmsAppPackagesProvider = provider;
		}

		public void setDialerAppPackagesProviderLPw(PackagesProvider provider) {
		mDialerAppPackagesProvider = provider;
		}

		public void grantDefaultPermissions(int userId) {
		@@ -171,7 +176,7 @@ final class DefaultPermissionGrantPolicy {
		}

		private void grantPermissionsToSysComponentsAndPrivApps(int userId) {
		Log.i(TAG, "Granting permissions to platform components");
		Log.i(TAG, "Granting permissions to platform components for user" + userId);

		synchronized (mService.mPackages) {
		for (PackageParser.Package pkg : mService.mPackages.values()) {
		@@ -203,18 +208,20 @@ final class DefaultPermissionGrantPolicy {
		}

		private void grantDefaultSystemHandlerPermissions(int userId) {
		Log.i(TAG, "Granting permissions to default platform handlers");
		Log.i(TAG, "Granting permissions to default platform handlers for user:" + userId);

		final PackagesProvider imePackagesProvider;
		final PackagesProvider locationPackagesProvider;
		final PackagesProvider voiceInteractionPackagesProvider;
		final PackagesProvider carrierAppPackagesProvider;
		final PackagesProvider smsAppPackagesProvider;
		final PackagesProvider dialerAppPackagesProvider;

		synchronized (mService.mPackages) {
		imePackagesProvider = mImePackagesProvider;
		locationPackagesProvider = mLocationPackagesProvider;
		voiceInteractionPackagesProvider = mVoiceInteractionPackagesProvider;
		carrierAppPackagesProvider = mCarrierAppPackagesProvider;
		smsAppPackagesProvider = mSmsAppPackagesProvider;
		dialerAppPackagesProvider = mDialerAppPackagesProvider;
		}

		String[] imePackageNames = (imePackagesProvider != null)
		@@ -223,8 +230,10 @@ final class DefaultPermissionGrantPolicy {
		? voiceInteractionPackagesProvider.getPackages(userId) : null;
		String[] locationPackageNames = (locationPackagesProvider != null)
		? locationPackagesProvider.getPackages(userId) : null;
		String[] carrierAppPackageNames = (carrierAppPackagesProvider != null)
		? carrierAppPackagesProvider.getPackages(userId) : null;
		String[] smsAppPackageNames = (smsAppPackagesProvider != null)
		? smsAppPackagesProvider.getPackages(userId) : null;
		String[] dialerAppPackageNames = (dialerAppPackagesProvider != null)
		? dialerAppPackagesProvider.getPackages(userId) : null;

		synchronized (mService.mPackages) {
		// Installers
		@@ -256,7 +265,7 @@ final class DefaultPermissionGrantPolicy {
		// SetupWizard
		Intent setupIntent = new Intent(Intent.ACTION_MAIN);
		setupIntent.addCategory(Intent.CATEGORY_HOME);
		PackageParser.Package setupPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package setupPackage = getDefaultSystemHandlerActivityPackageLPr(
		setupIntent, userId);
		if (setupPackage != null
		&& doesPackageSupportRuntimePermissions(setupPackage)) {
		@@ -265,10 +274,10 @@ final class DefaultPermissionGrantPolicy {
		grantRuntimePermissionsLPw(setupPackage, SETTINGS_PERMISSIONS, userId);
		}

		// Phone
		Intent dialerIntent = new Intent(Intent.ACTION_DIAL);
		PackageParser.Package dialerPackage = getDefaultSystemHandlerActvityPackageLPr(
		dialerIntent, userId);
		// Dialer
		if (dialerAppPackageNames != null) {
		for (String dialerAppPackageName : dialerAppPackageNames) {
		PackageParser.Package dialerPackage = getPackageLPr(dialerAppPackageName);
		if (dialerPackage != null
		&& doesPackageSupportRuntimePermissions(dialerPackage)) {
		grantRuntimePermissionsLPw(dialerPackage, PHONE_PERMISSIONS, userId);
		@@ -276,10 +285,12 @@ final class DefaultPermissionGrantPolicy {
		grantRuntimePermissionsLPw(dialerPackage, SMS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(dialerPackage, MICROPHONE_PERMISSIONS, userId);
		}
		}
		}

		// Camera
		Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
		PackageParser.Package cameraPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package cameraPackage = getDefaultSystemHandlerActivityPackageLPr(
		cameraIntent, userId);
		if (cameraPackage != null
		&& doesPackageSupportRuntimePermissions(cameraPackage)) {
		@@ -304,29 +315,30 @@ final class DefaultPermissionGrantPolicy {

		// Downloads UI
		Intent downloadsUiIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
		PackageParser.Package downloadsUiPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package downloadsUiPackage = getDefaultSystemHandlerActivityPackageLPr(
		downloadsUiIntent, userId);
		if (downloadsUiPackage != null
		&& doesPackageSupportRuntimePermissions(downloadsUiPackage)) {
		grantRuntimePermissionsLPw(downloadsUiPackage, STORAGE_PERMISSIONS, userId);
		}

		// Messaging
		Intent messagingIntent = new Intent(Intent.ACTION_MAIN);
		messagingIntent.addCategory(Intent.CATEGORY_APP_MESSAGING);
		PackageParser.Package messagingPackage = getDefaultSystemHandlerActvityPackageLPr(
		messagingIntent, userId);
		if (messagingPackage != null
		&& doesPackageSupportRuntimePermissions(messagingPackage)) {
		grantRuntimePermissionsLPw(messagingPackage, PHONE_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(messagingPackage, CONTACTS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(messagingPackage, SMS_PERMISSIONS, userId);
		// SMS
		if (smsAppPackageNames != null) {
		for (String smsPackageName : smsAppPackageNames) {
		PackageParser.Package smsPackage = getPackageLPr(smsPackageName);
		if (smsPackage != null
		&& doesPackageSupportRuntimePermissions(smsPackage)) {
		grantRuntimePermissionsLPw(smsPackage, PHONE_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(smsPackage, CONTACTS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(smsPackage, SMS_PERMISSIONS, userId);
		}
		}
		}

		// Calendar
		Intent calendarIntent = new Intent(Intent.ACTION_MAIN);
		calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR);
		PackageParser.Package calendarPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package calendarPackage = getDefaultSystemHandlerActivityPackageLPr(
		calendarIntent, userId);
		if (calendarPackage != null
		&& doesPackageSupportRuntimePermissions(calendarPackage)) {
		@@ -348,7 +360,7 @@ final class DefaultPermissionGrantPolicy {
		// Contacts
		Intent contactsIntent = new Intent(Intent.ACTION_MAIN);
		contactsIntent.addCategory(Intent.CATEGORY_APP_CONTACTS);
		PackageParser.Package contactsPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package contactsPackage = getDefaultSystemHandlerActivityPackageLPr(
		contactsIntent, userId);
		if (contactsPackage != null
		&& doesPackageSupportRuntimePermissions(contactsPackage)) {
		@@ -379,7 +391,7 @@ final class DefaultPermissionGrantPolicy {
		// Maps
		Intent mapsIntent = new Intent(Intent.ACTION_MAIN);
		mapsIntent.addCategory(Intent.CATEGORY_APP_MAPS);
		PackageParser.Package mapsPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package mapsPackage = getDefaultSystemHandlerActivityPackageLPr(
		mapsIntent, userId);
		if (mapsPackage != null
		&& doesPackageSupportRuntimePermissions(mapsPackage)) {
		@@ -389,7 +401,7 @@ final class DefaultPermissionGrantPolicy {
		// Email
		Intent emailIntent = new Intent(Intent.ACTION_MAIN);
		emailIntent.addCategory(Intent.CATEGORY_APP_EMAIL);
		PackageParser.Package emailPackage = getDefaultSystemHandlerActvityPackageLPr(
		PackageParser.Package emailPackage = getDefaultSystemHandlerActivityPackageLPr(
		emailIntent, userId);
		if (emailPackage != null
		&& doesPackageSupportRuntimePermissions(emailPackage)) {
		@@ -397,10 +409,17 @@ final class DefaultPermissionGrantPolicy {
		}

		// Browser
		PackageParser.Package browserPackage = null;
		String defaultBrowserPackage = mService.getDefaultBrowserPackageName(userId);
		if (defaultBrowserPackage != null) {
		browserPackage = getPackageLPr(defaultBrowserPackage);
		}
		if (browserPackage == null) {
		Intent browserIntent = new Intent(Intent.ACTION_MAIN);
		browserIntent.addCategory(Intent.CATEGORY_APP_BROWSER);
		PackageParser.Package browserPackage = getDefaultSystemHandlerActvityPackageLPr(
		browserPackage = getDefaultSystemHandlerActivityPackageLPr(
		browserIntent, userId);
		}
		if (browserPackage != null
		&& doesPackageSupportRuntimePermissions(browserPackage)) {
		grantRuntimePermissionsLPw(browserPackage, LOCATION_PERMISSIONS, userId);
		@@ -459,9 +478,44 @@ final class DefaultPermissionGrantPolicy {
		}
		}

		// Carrier apps
		if (carrierAppPackageNames != null) {
		for (String packageName : carrierAppPackageNames) {
		mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
		}
		}

		public void grantDefaultPermissionsToDefaultSmsAppLPr(String packageName, int userId) {
		Log.i(TAG, "Granting permissions to default sms app for user:" + userId);
		if (packageName == null) {
		return;
		}
		PackageParser.Package smsPackage = getPackageLPr(packageName);
		if (smsPackage != null && doesPackageSupportRuntimePermissions(smsPackage)) {
		grantRuntimePermissionsLPw(smsPackage, PHONE_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(smsPackage, CONTACTS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(smsPackage, SMS_PERMISSIONS, userId);
		}
		}

		public void grantDefaultPermissionsToDefaultDialerAppLPr(String packageName, int userId) {
		Log.i(TAG, "Granting permissions to default dialer app for user:" + userId);
		if (packageName == null) {
		return;
		}
		PackageParser.Package dialerPackage = getPackageLPr(packageName);
		if (dialerPackage != null
		&& doesPackageSupportRuntimePermissions(dialerPackage)) {
		grantRuntimePermissionsLPw(dialerPackage, PHONE_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(dialerPackage, CONTACTS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(dialerPackage, SMS_PERMISSIONS, userId);
		grantRuntimePermissionsLPw(dialerPackage, MICROPHONE_PERMISSIONS, userId);
		}
		}

		public void grantDefaultPermissionsToEnabledCarrierAppsLPr(String[] packageNames, int userId) {
		Log.i(TAG, "Granting permissions to enabled carrier apps for user:" + userId);
		if (packageNames == null) {
		return;
		}
		for (String packageName : packageNames) {
		PackageParser.Package carrierPackage = getSystemPackageLPr(packageName);
		if (carrierPackage != null
		&& doesPackageSupportRuntimePermissions(carrierPackage)) {
		@@ -471,7 +525,15 @@ final class DefaultPermissionGrantPolicy {
		}
		}

		mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
		public void grantDefaultPermissionsToDefaultBrowserLPr(String packageName, int userId) {
		Log.i(TAG, "Granting permissions to default browser for user:" + userId);
		if (packageName == null) {
		return;
		}
		PackageParser.Package browserPackage = getSystemPackageLPr(packageName);
		if (browserPackage != null
		&& doesPackageSupportRuntimePermissions(browserPackage)) {
		grantRuntimePermissionsLPw(browserPackage, LOCATION_PERMISSIONS, userId);
		}
		}

		@@ -505,7 +567,7 @@ final class DefaultPermissionGrantPolicy {
		return handlerPackages;
		}

		private PackageParser.Package getDefaultSystemHandlerActvityPackageLPr(
		private PackageParser.Package getDefaultSystemHandlerActivityPackageLPr(
		Intent intent, int userId) {
		List<ResolveInfo> handlers = mService.queryIntentActivities(intent, null, 0, userId);
		final int handlerCount = handlers.size();
		@@ -530,8 +592,12 @@ final class DefaultPermissionGrantPolicy {
		return null;
		}

		private PackageParser.Package getPackageLPr(String packageName) {
		return mService.mPackages.get(packageName);
		}

		private PackageParser.Package getSystemPackageLPr(String packageName) {
		PackageParser.Package pkg = mService.mPackages.get(packageName);
		PackageParser.Package pkg = getPackageLPr(packageName);
		if (pkg != null && pkg.isSystemApp()) {
		return !isSysComponentOrPersistentPrivApp(pkg) ? pkg : null;
		}