Merge "Update PiP AppOps flag to enforce all PiP functionality." (248278fc) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4167,6 +4167,7 @@ package android.app {
		field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location";
		field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power";
		field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location";
		field public static final java.lang.String OPSTR_PICTURE_IN_PICTURE = "android:picture_in_picture";
		field public static final java.lang.String OPSTR_PROCESS_OUTGOING_CALLS = "android:process_outgoing_calls";
		field public static final java.lang.String OPSTR_READ_CALENDAR = "android:read_calendar";
		field public static final java.lang.String OPSTR_READ_CALL_LOG = "android:read_call_log";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4310,6 +4310,7 @@ package android.app {
		field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location";
		field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power";
		field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location";
		field public static final java.lang.String OPSTR_PICTURE_IN_PICTURE = "android:picture_in_picture";
		field public static final java.lang.String OPSTR_PROCESS_OUTGOING_CALLS = "android:process_outgoing_calls";
		field public static final java.lang.String OPSTR_READ_CALENDAR = "android:read_calendar";
		field public static final java.lang.String OPSTR_READ_CALL_LOG = "android:read_call_log";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4177,6 +4177,7 @@ package android.app {
		field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location";
		field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power";
		field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location";
		field public static final java.lang.String OPSTR_PICTURE_IN_PICTURE = "android:picture_in_picture";
		field public static final java.lang.String OPSTR_PROCESS_OUTGOING_CALLS = "android:process_outgoing_calls";
		field public static final java.lang.String OPSTR_READ_CALENDAR = "android:read_calendar";
		field public static final java.lang.String OPSTR_READ_CALL_LOG = "android:read_call_log";

core/java/android/app/AppOpsManager.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -245,8 +245,8 @@ public class AppOpsManager {
		public static final int OP_READ_PHONE_NUMBER = 65;
		/** @hide Request package installs through package installer */
		public static final int OP_REQUEST_INSTALL_PACKAGES = 66;
		/** @hide Enter picture-in-picture when hidden. */
		public static final int OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE = 67;
		/** @hide Enter picture-in-picture. */
		public static final int OP_PICTURE_IN_PICTURE = 67;
		/** @hide Instant app start foreground service. */
		public static final int OP_INSTANT_APP_START_FOREGROUND = 68;
		/** @hide Answer incoming phone calls */
		@@ -355,6 +355,9 @@ public class AppOpsManager {
		= "android:get_accounts";
		public static final String OPSTR_READ_PHONE_NUMBER
		= "android:read_phone_number";
		/** Access to picture-in-picture. */
		public static final String OPSTR_PICTURE_IN_PICTURE
		= "android:picture_in_picture";
		/** @hide */
		public static final String OPSTR_INSTANT_APP_START_FOREGROUND
		= "android:instant_app_start_foreground";
		@@ -486,7 +489,7 @@ public class AppOpsManager {
		OP_AUDIO_ACCESSIBILITY_VOLUME,
		OP_READ_PHONE_NUMBER,
		OP_REQUEST_INSTALL_PACKAGES,
		OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE,
		OP_PICTURE_IN_PICTURE,
		OP_INSTANT_APP_START_FOREGROUND,
		OP_ANSWER_PHONE_CALLS
		};
		@@ -563,7 +566,7 @@ public class AppOpsManager {
		null, // OP_AUDIO_ACCESSIBILITY_VOLUME
		OPSTR_READ_PHONE_NUMBER,
		null, // OP_REQUEST_INSTALL_PACKAGES
		null,
		OPSTR_PICTURE_IN_PICTURE,
		OPSTR_INSTANT_APP_START_FOREGROUND,
		OPSTR_ANSWER_PHONE_CALLS,
		};
		@@ -640,7 +643,7 @@ public class AppOpsManager {
		"AUDIO_ACCESSIBILITY_VOLUME",
		"READ_PHONE_NUMBER",
		"REQUEST_INSTALL_PACKAGES",
		"OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE",
		"PICTURE_IN_PICTURE",
		"INSTANT_APP_START_FOREGROUND",
		"ANSWER_PHONE_CALLS",
		};
		@@ -948,7 +951,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // OP_AUDIO_ACCESSIBILITY_VOLUME
		AppOpsManager.MODE_ALLOWED,
		AppOpsManager.MODE_DEFAULT, // OP_REQUEST_INSTALL_PACKAGES
		AppOpsManager.MODE_ALLOWED, // OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE
		AppOpsManager.MODE_ALLOWED, // OP_PICTURE_IN_PICTURE
		AppOpsManager.MODE_DEFAULT, // OP_INSTANT_APP_START_FOREGROUND
		AppOpsManager.MODE_ALLOWED, // ANSWER_PHONE_CALLS
		};
		@@ -1028,7 +1031,7 @@ public class AppOpsManager {
		false, // OP_AUDIO_ACCESSIBILITY_VOLUME
		false,
		false, // OP_REQUEST_INSTALL_PACKAGES
		false, // OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE
		false, // OP_PICTURE_IN_PICTURE
		false,
		false, // ANSWER_PHONE_CALLS
		};

proto/src/metrics_constants.proto

+4 −4

Original line number	Diff line number	Diff line
		@@ -3345,11 +3345,11 @@ message MetricsEvent {
		// CATEGORY: SETTINGS
		SETTINGS_MANAGE_PICTURE_IN_PICTURE = 812;

		// ACTION: Allow "Enable picture-in-picture on hide" for an app
		APP_PICTURE_IN_PICTURE_ON_HIDE_ALLOW = 813;
		// ACTION: Allow "Enable picture-in-picture" for an app
		APP_PICTURE_IN_PICTURE_ALLOW = 813;

		// ACTION: Deny "Enable picture-in-picture on hide" for an app
		APP_PICTURE_IN_PICTURE_ON_HIDE_DENY = 814;
		// ACTION: Deny "Enable picture-in-picture" for an app
		APP_PICTURE_IN_PICTURE_DENY = 814;

		// OPEN: Settings > Language & input > Text-to-speech output -> Speech rate & pitch
		// CATEGORY: SETTINGS