Merge tag 'android-7.0.0_r6' of... (6e58fd35) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/HelpUtils.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Resources.Theme;
		import android.net.Uri;
		import android.provider.Settings.Global;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.TypedValue;
		@@ -91,6 +92,9 @@ public class HelpUtils {
		*/
		public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,
		String helpUriString, String backupContext) {
		if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
		return false;
		}
		if (TextUtils.isEmpty(helpUriString)) {
		// The help url string is empty or null, so set the help menu item to be invisible.
		helpMenuItem.setVisible(false);
		@@ -128,6 +132,9 @@ public class HelpUtils {

		public static Intent getHelpIntent(Context context, String helpUriString,
		String backupContext) {
		if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
		return null;
		}
		// Try to handle as Intent Uri, otherwise just treat as Uri.
		try {
		Intent intent = Intent.parseUri(helpUriString,

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.graphics.drawable.Icon;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings.Global;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.Pair;
		@@ -115,6 +116,8 @@ public class TileUtils {
		public static List<DashboardCategory> getCategories(Context context,
		HashMap<Pair<String, String>, Tile> cache) {
		final long startTime = System.currentTimeMillis();
		boolean setup = Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0)
		!= 0;
		ArrayList<Tile> tiles = new ArrayList<>();
		UserManager userManager = UserManager.get(context);
		for (UserHandle user : userManager.getUserProfiles()) {
		@@ -127,8 +130,10 @@ public class TileUtils {
		getTilesForAction(context, user, MANUFACTURER_SETTINGS, cache,
		MANUFACTURER_DEFAULT_CATEGORY, tiles, false);
		}
		if (setup) {
		getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);
		}
		}
		HashMap<String, DashboardCategory> categoryMap = new HashMap<>();
		for (Tile tile : tiles) {
		DashboardCategory category = categoryMap.get(tile.category);

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+19 −3

Original line number	Diff line number	Diff line
		@@ -804,7 +804,8 @@ public class SettingsProvider extends ContentProvider {

		// If this is a setting that is currently restricted for this user, do not allow
		// unrestricting changes.
		if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
		if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value,
		Binder.getCallingUid())) {
		return false;
		}

		@@ -935,7 +936,8 @@ public class SettingsProvider extends ContentProvider {

		// If this is a setting that is currently restricted for this user, do not allow
		// unrestricting changes.
		if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
		if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value,
		Binder.getCallingUid())) {
		return false;
		}

		@@ -1158,7 +1160,7 @@ public class SettingsProvider extends ContentProvider {
		* @return true if the change is prohibited, false if the change is allowed.
		*/
		private boolean isGlobalOrSecureSettingRestrictedForUser(String setting, int userId,
		String value) {
		String value, int callingUid) {
		String restriction;
		switch (setting) {
		case Settings.Secure.LOCATION_MODE:
		@@ -1196,6 +1198,20 @@ public class SettingsProvider extends ContentProvider {
		restriction = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
		break;

		case Settings.Secure.ALWAYS_ON_VPN_APP:
		case Settings.Secure.ALWAYS_ON_VPN_LOCKDOWN:
		// Whitelist system uid (ConnectivityService) and root uid to change always-on vpn
		if (callingUid == Process.SYSTEM_UID \|\| callingUid == Process.ROOT_UID) {
		return false;
		}
		restriction = UserManager.DISALLOW_CONFIG_VPN;
		break;

		case Settings.Global.SAFE_BOOT_DISALLOWED:
		if ("1".equals(value)) return false;
		restriction = UserManager.DISALLOW_SAFE_BOOT;
		break;

		default:
		if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) {
		if ("0".equals(value)) return false;

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+14 −11

Original line number	Diff line number	Diff line
		@@ -353,20 +353,23 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		MetricsLogger.action(mContext,
		MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
		if (mSettingsButton.isTunerClick()) {
		mHost.startRunnableDismissingKeyguard(() -> post(() -> {
		if (TunerService.isTunerEnabled(mContext)) {
		TunerService.showResetRequest(mContext, new Runnable() {
		@Override
		public void run() {
		TunerService.showResetRequest(mContext, () -> {
		// Relaunch settings so that the tuner disappears.
		startSettingsActivity();
		}
		});
		} else {
		Toast.makeText(getContext(), R.string.tuner_toast, Toast.LENGTH_LONG).show();
		Toast.makeText(getContext(), R.string.tuner_toast,
		Toast.LENGTH_LONG).show();
		TunerService.setTunerEnabled(mContext, true);
		}
		}
		startSettingsActivity();

		}));
		} else {
		startSettingsActivity();
		}
		} else if (v == mAlarmStatus && mNextAlarm != null) {
		PendingIntent showIntent = mNextAlarm.getShowIntent();
		if (showIntent != null && showIntent.isActivity()) {

services/core/java/com/android/server/notification/NotificationManagerService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -2110,6 +2110,7 @@ public class NotificationManagerService extends SystemService {
		android.Manifest.permission.MANAGE_NOTIFICATIONS)) {
		return;
		}
		checkCallerIsSameApp(pkg);
		if (!checkPolicyAccess(pkg)) {
		Slog.w(TAG, "Notification policy access denied calling " + method);
		throw new SecurityException("Notification policy access denied");
		@@ -3852,6 +3853,10 @@ public class NotificationManagerService extends SystemService {
		if (isCallerSystem()) {
		return;
		}
		checkCallerIsSameApp(pkg);
		}

		private static void checkCallerIsSameApp(String pkg) {
		final int uid = Binder.getCallingUid();
		try {
		ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(