Merge "[SettingsProvider] do not check @Readable for system/priv apps in the server" into sc-dev (7ddd1bd4) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1937,8 +1937,11 @@ public class SettingsProvider extends ContentProvider {
	if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {		if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
	return;		return;
	}		}
	checkReadableAnnotation(settingsType, settingName);
	ApplicationInfo ai = getCallingApplicationInfoOrThrow();		ApplicationInfo ai = getCallingApplicationInfoOrThrow();
			if (ai.isSystemApp() \|\| ai.isSignedWithPlatformKey()) {
			return;
			}
			checkReadableAnnotation(settingsType, settingName);
	if (!ai.isInstantApp()) {		if (!ai.isInstantApp()) {
	return;		return;
	}		}