Snap for 6298421 from c2a4ca2d0563984806b8ac9891a6400c2a616bbb to mainline-release (84b93853) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -6912,7 +6912,6 @@ package android.app.admin {
		method @Nullable public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(@NonNull android.content.ComponentName);
		method @Nullable public java.util.List<java.lang.String> getPermittedInputMethods(@NonNull android.content.ComponentName);
		method public int getPersonalAppsSuspendedReasons(@NonNull android.content.ComponentName);
		method @NonNull public java.util.List<java.lang.String> getProtectedPackages(@NonNull android.content.ComponentName);
		method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName);
		method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);
		method public java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);
		@@ -6923,6 +6922,7 @@ package android.app.admin {
		method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
		method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();
		method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);
		method @NonNull public java.util.List<java.lang.String> getUserControlDisabledPackages(@NonNull android.content.ComponentName);
		method @NonNull public android.os.Bundle getUserRestrictions(@NonNull android.content.ComponentName);
		method @Nullable public String getWifiMacAddress(@NonNull android.content.ComponentName);
		method public boolean grantKeyPairToApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);
		@@ -7042,7 +7042,6 @@ package android.app.admin {
		method public void setPersonalAppsSuspended(@NonNull android.content.ComponentName, boolean);
		method public void setProfileEnabled(@NonNull android.content.ComponentName);
		method public void setProfileName(@NonNull android.content.ComponentName, String);
		method public void setProtectedPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
		method public void setRecommendedGlobalProxy(@NonNull android.content.ComponentName, @Nullable android.net.ProxyInfo);
		method public void setRequiredStrongAuthTimeout(@NonNull android.content.ComponentName, long);
		method public boolean setResetPasswordToken(android.content.ComponentName, byte[]);
		@@ -7061,6 +7060,7 @@ package android.app.admin {
		method public boolean setTimeZone(@NonNull android.content.ComponentName, String);
		method public void setTrustAgentConfiguration(@NonNull android.content.ComponentName, @NonNull android.content.ComponentName, android.os.PersistableBundle);
		method public void setUninstallBlocked(@Nullable android.content.ComponentName, String, boolean);
		method public void setUserControlDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
		method public void setUserIcon(@NonNull android.content.ComponentName, android.graphics.Bitmap);
		method public int startUserInBackground(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
		method public int stopUser(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
		@@ -27051,7 +27051,7 @@ package android.media {
		method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int);
		}

		public class MediaRouter2 {
		public final class MediaRouter2 {
		method @NonNull public java.util.List<android.media.MediaRouter2.RoutingController> getControllers();
		method @NonNull public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context);
		method @NonNull public java.util.List<android.media.MediaRoute2Info> getRoutes();
		@@ -53609,10 +53609,11 @@ package android.view {

		public class SurfaceControlViewHost {
		ctor public SurfaceControlViewHost(@NonNull android.content.Context, @NonNull android.view.Display, @Nullable android.os.IBinder);
		method public void addView(@NonNull android.view.View, int, int);
		method @Nullable public android.view.SurfaceControlViewHost.SurfacePackage getSurfacePackage();
		method @Nullable public android.view.View getView();
		method public void relayout(int, int);
		method public void release();
		method public void setView(@NonNull android.view.View, int, int);
		}

		public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {

api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -5489,7 +5489,7 @@ package android.media.tv.tuner.frontend {
		public class DvbcFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(@NonNull android.content.Context);
		method public int getAnnex();
		method public long getFec();
		method public long getInnerFec();
		method public int getModulation();
		method public int getOuterFec();
		method public int getSpectralInversion();
		@@ -5517,7 +5517,7 @@ package android.media.tv.tuner.frontend {
		public static class DvbcFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder> {
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings build();
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(int);
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setFec(long);
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setInnerFec(long);
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setModulation(int);
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setOuterFec(int);
		method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setSpectralInversion(int);
		@@ -5783,9 +5783,9 @@ package android.media.tv.tuner.frontend {
		method public int getAgc();
		method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpInfo[] getAtsc3PlpInfo();
		method public int getBer();
		method public long getFec();
		method public int getFreqOffset();
		method public int getHierarchy();
		method public long getInnerFec();
		method @NonNull public boolean[] getLayerErrors();
		method public int getLnbVoltage();
		method public int getMer();

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4957,8 +4957,8 @@ package android.view {
		}

		public class SurfaceControlViewHost {
		method public void addView(@NonNull android.view.View, android.view.WindowManager.LayoutParams);
		method public void relayout(android.view.WindowManager.LayoutParams);
		method public void setView(@NonNull android.view.View, @NonNull android.view.WindowManager.LayoutParams);
		}

		@UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

cmds/statsd/src/atoms.proto

+10 −14

Original line number	Diff line number	Diff line
		@@ -3332,16 +3332,12 @@ message ForegroundServiceAppOpSessionEnded {
		optional int32 uid = 1 [(is_uid) = true];

		// The operation's name.
		// To the extent possible, preserve the mapping from AppOpsManager.OP_ constants.
		// Only these named ops are actually logged.
		enum AppOpName {
		OP_NONE = -1; // Also represents UNKNOWN.
		OP_COARSE_LOCATION = 0;
		OP_FINE_LOCATION = 1;
		OP_CAMERA = 26;
		OP_RECORD_AUDIO = 27;
		}
		optional AppOpName app_op_name = 2 [default = OP_NONE];
		// Only following four ops are logged
		// COARSE_LOCATION = 0
		// FINE_LOCATION = 1
		// CAMERA = 26
		// RECORD_AUDIO = 27
		optional android.app.AppOpEnum app_op_name = 2 [default = APP_OP_NONE];

		// The uid's permission mode for accessing the AppOp during this fgs session.
		enum Mode {
		@@ -7571,8 +7567,8 @@ message AppOps {
		// Name of the package performing the op
		optional string package_name = 2;

		// operation id; maps to the OP_* constants in AppOpsManager.java
		optional int32 op_id = 3;
		// operation id
		optional android.app.AppOpEnum op_id = 3 [default = APP_OP_NONE];

		// The number of times the op was granted while the app was in the
		// foreground (only for trusted requests)
		@@ -7617,8 +7613,8 @@ message AttributedAppOps {
		// above.
		optional string tag = 3;

		// operation id; maps to the OPSTR_* constants in AppOpsManager.java
		optional string op = 4;
		// operation id
		optional android.app.AppOpEnum op = 4 [default = APP_OP_NONE];

		// The number of times the op was granted while the app was in the
		// foreground (only for trusted requests)

core/java/android/app/AppOpsManager.java

+126 −0

Original line number	Diff line number	Diff line
		@@ -2333,6 +2333,114 @@ public class AppOpsManager {
		false, // AUTO_REVOKE_MANAGED_BY_INSTALLER
		};

		/**
		* This maps each operation to its statsd logging code.
		*/
		private static int[] sOpToLoggingId = new int[]{
		AppProtoEnums.APP_OP_COARSE_LOCATION, // OP_COARSE_LOCATION
		AppProtoEnums.APP_OP_FINE_LOCATION, // OP_FINE_LOCATION
		AppProtoEnums.APP_OP_GPS, // OP_ID__GPS
		AppProtoEnums.APP_OP_VIBRATE, // OP_VIBRATE
		AppProtoEnums.APP_OP_READ_CONTACTS, // OP_READ_CONTACTS
		AppProtoEnums.APP_OP_WRITE_CONTACTS, // OP_WRITE_CONTACTS
		AppProtoEnums.APP_OP_READ_CALL_LOG, // OP_READ_CALL_LOG
		AppProtoEnums.APP_OP_WRITE_CALL_LOG, // OP_WRITE_CALL_LOG
		AppProtoEnums.APP_OP_READ_CALENDAR, // OP_READ_CALENDAR
		AppProtoEnums.APP_OP_WRITE_CALENDAR, // OP_WRITE_CALENDAR
		AppProtoEnums.APP_OP_WIFI_SCAN, // OP_WIFI_SCAN
		AppProtoEnums.APP_OP_POST_NOTIFICATION, // OP_POST_NOTIFICATION
		AppProtoEnums.APP_OP_NEIGHBORING_CELLS, // OP_NEIGHBORING_CELLS
		AppProtoEnums.APP_OP_CALL_PHONE, // OP_CALL_PHONE
		AppProtoEnums.APP_OP_READ_SMS, // OP_READ_SMS
		AppProtoEnums.APP_OP_WRITE_SMS, // OP_WRITE_SMS
		AppProtoEnums.APP_OP_RECEIVE_SMS, // OP_RECEIVE_SMS
		AppProtoEnums.APP_OP_RECEIVE_EMERGENCY_SMS, // OP_RECEIVE_EMERGENCY_SMS
		AppProtoEnums.APP_OP_RECEIVE_MMS, // OP_RECEIVE_MMS
		AppProtoEnums.APP_OP_RECEIVE_WAP_PUSH, // OP_RECEIVE_WAP_PUSH
		AppProtoEnums.APP_OP_SEND_SMS, // OP_SEND_SMS
		AppProtoEnums.APP_OP_READ_ICC_SMS, // OP_READ_ICC_SMS
		AppProtoEnums.APP_OP_WRITE_ICC_SMS, // OP_WRITE_ICC_SMS
		AppProtoEnums.APP_OP_WRITE_SETTINGS, // OP_WRITE_SETTINGS
		AppProtoEnums.APP_OP_SYSTEM_ALERT_WINDOW, // OP_SYSTEM_ALERT_WINDOW
		AppProtoEnums.APP_OP_ACCESS_NOTIFICATIONS, // OP_ACCESS_NOTIFICATIONS
		AppProtoEnums.APP_OP_CAMERA, // OP_CAMERA
		AppProtoEnums.APP_OP_RECORD_AUDIO, // OP_RECORD_AUDIO
		AppProtoEnums.APP_OP_PLAY_AUDIO, // OP_PLAY_AUDIO
		AppProtoEnums.APP_OP_READ_CLIPBOARD, // OP_READ_CLIPBOARD
		AppProtoEnums.APP_OP_WRITE_CLIPBOARD, // OP_WRITE_CLIPBOARD
		AppProtoEnums.APP_OP_TAKE_MEDIA_BUTTONS, // OP_TAKE_MEDIA_BUTTONS
		AppProtoEnums.APP_OP_TAKE_AUDIO_FOCUS, // OP_TAKE_AUDIO_FOCUS
		AppProtoEnums.APP_OP_AUDIO_MASTER_VOLUME, // OP_AUDIO_MASTER_VOLUME
		AppProtoEnums.APP_OP_AUDIO_VOICE_VOLUME, // OP_AUDIO_VOICE_VOLUME
		AppProtoEnums.APP_OP_AUDIO_RING_VOLUME, // OP_AUDIO_RING_VOLUME
		AppProtoEnums.APP_OP_AUDIO_MEDIA_VOLUME, // OP_AUDIO_MEDIA_VOLUME
		AppProtoEnums.APP_OP_AUDIO_ALARM_VOLUME, // OP_AUDIO_ALARM_VOLUME
		AppProtoEnums.APP_OP_AUDIO_NOTIFICATION_VOLUME, // OP_AUDIO_NOTIFICATION_VOLUME
		AppProtoEnums.APP_OP_AUDIO_BLUETOOTH_VOLUME, // OP_AUDIO_BLUETOOTH_VOLUME
		AppProtoEnums.APP_OP_WAKE_LOCK, // OP_WAKE_LOCK
		AppProtoEnums.APP_OP_MONITOR_LOCATION, // OP_MONITOR_LOCATION
		AppProtoEnums.APP_OP_MONITOR_HIGH_POWER_LOCATION, // OP_MONITOR_HIGH_POWER_LOCATION
		AppProtoEnums.APP_OP_GET_USAGE_STATS, // OP_GET_USAGE_STATS
		AppProtoEnums.APP_OP_MUTE_MICROPHONE, //OP_MUTE_MICROPHONE
		AppProtoEnums.APP_OP_TOAST_WINDOW, // OP_TOAST_WINDOW
		AppProtoEnums.APP_OP_PROJECT_MEDIA, // OP_PROJECT_MEDIA
		AppProtoEnums.APP_OP_ACTIVATE_VPN, // OP_ACTIVATE_VPN
		AppProtoEnums.APP_OP_WRITE_WALLPAPER, // OP_WRITE_WALLPAPER
		AppProtoEnums.APP_OP_ASSIST_STRUCTURE, // OP_ASSIST_STRUCTURE
		AppProtoEnums.APP_OP_ASSIST_SCREENSHOT, // OP_ASSIST_SCREENSHOT
		AppProtoEnums.APP_OP_READ_PHONE_STATE, // OP_READ_PHONE_STATE
		AppProtoEnums.APP_OP_ADD_VOICEMAIL, // OP_ADD_VOICEMAIL
		AppProtoEnums.APP_OP_USE_SIP, // OP_USE_SIP
		AppProtoEnums.APP_OP_PROCESS_OUTGOING_CALLS, // OP_PROCESS_OUTGOING_CALLS
		AppProtoEnums.APP_OP_USE_FINGERPRINT, // OP_USE_FINGERPRINT
		AppProtoEnums.APP_OP_BODY_SENSORS, // OP_BODY_SENSORS
		AppProtoEnums.APP_OP_READ_CELL_BROADCASTS, // OP_READ_CELL_BROADCASTS
		AppProtoEnums.APP_OP_MOCK_LOCATION, // OP_MOCK_LOCATION
		AppProtoEnums.APP_OP_READ_EXTERNAL_STORAGE, // OP_READ_EXTERNAL_STORAGE
		AppProtoEnums.APP_OP_WRITE_EXTERNAL_STORAGE, // OP_WRITE_EXTERNAL_STORAGE
		AppProtoEnums.APP_OP_TURN_SCREEN_ON, // OP_TURN_SCREEN_ON
		AppProtoEnums.APP_OP_GET_ACCOUNTS, // OP_GET_ACCOUNTS
		AppProtoEnums.APP_OP_RUN_IN_BACKGROUND, // OP_RUN_IN_BACKGROUND
		AppProtoEnums.APP_OP_AUDIO_ACCESSIBILITY_VOLUME, // OP_AUDIO_ACCESSIBILITY_VOLUME
		AppProtoEnums.APP_OP_READ_PHONE_NUMBERS, // OP_READ_PHONE_NUMBERS
		AppProtoEnums.APP_OP_REQUEST_INSTALL_PACKAGES, // OP_REQUEST_INSTALL_PACKAGES
		AppProtoEnums.APP_OP_PICTURE_IN_PICTURE, // OP_PICTURE_IN_PICTURE
		AppProtoEnums.APP_OP_INSTANT_APP_START_FOREGROUND, // OP_INSTANT_APP_START_FOREGROUND
		AppProtoEnums.APP_OP_ANSWER_PHONE_CALLS, // OP_ANSWER_PHONE_CALLS
		AppProtoEnums.APP_OP_RUN_ANY_IN_BACKGROUND, // OP_RUN_ANY_IN_BACKGROUND
		AppProtoEnums.APP_OP_CHANGE_WIFI_STATE, // OP_CHANGE_WIFI_STATE
		AppProtoEnums.APP_OP_REQUEST_DELETE_PACKAGES, // OP_REQUEST_DELETE_PACKAGES
		AppProtoEnums.APP_OP_BIND_ACCESSIBILITY_SERVICE, // OP_BIND_ACCESSIBILITY_SERVICE
		AppProtoEnums.APP_OP_ACCEPT_HANDOVER, // OP_ACCEPT_HANDOVER
		AppProtoEnums.APP_OP_MANAGE_IPSEC_TUNNELS, // OP_MANAGE_IPSEC_TUNNELS
		AppProtoEnums.APP_OP_START_FOREGROUND, // OP_START_FOREGROUND
		AppProtoEnums.APP_OP_BLUETOOTH_SCAN, // OP_BLUETOOTH_SCAN
		AppProtoEnums.APP_OP_USE_BIOMETRIC, // OP_USE_BIOMETRIC
		AppProtoEnums.APP_OP_ACTIVITY_RECOGNITION, // OP_ACTIVITY_RECOGNITION
		AppProtoEnums.APP_OP_SMS_FINANCIAL_TRANSACTIONS, // OP_SMS_FINANCIAL_TRANSACTIONS
		AppProtoEnums.APP_OP_READ_MEDIA_AUDIO, // OP_READ_MEDIA_AUDIO
		AppProtoEnums.APP_OP_WRITE_MEDIA_AUDIO, // OP_WRITE_MEDIA_AUDIO
		AppProtoEnums.APP_OP_READ_MEDIA_VIDEO, // OP_READ_MEDIA_VIDEO
		AppProtoEnums.APP_OP_WRITE_MEDIA_VIDEO, // OP_WRITE_MEDIA_VIDEO
		AppProtoEnums.APP_OP_READ_MEDIA_IMAGES, // OP_READ_MEDIA_IMAGES
		AppProtoEnums.APP_OP_WRITE_MEDIA_IMAGES, // OP_WRITE_MEDIA_IMAGES
		AppProtoEnums.APP_OP_LEGACY_STORAGE, // OP_LEGACY_STORAGE
		AppProtoEnums.APP_OP_ACCESS_ACCESSIBILITY, // OP_ACCESS_ACCESSIBILITY
		AppProtoEnums.APP_OP_READ_DEVICE_IDENTIFIERS, // OP_READ_DEVICE_IDENTIFIERS
		AppProtoEnums.APP_OP_ACCESS_MEDIA_LOCATION, // OP_ACCESS_MEDIA_LOCATION
		AppProtoEnums.APP_OP_QUERY_ALL_PACKAGES, // OP_QUERY_ALL_PACKAGES
		AppProtoEnums.APP_OP_MANAGE_EXTERNAL_STORAGE, // OP_MANAGE_EXTERNAL_STORAGE
		AppProtoEnums.APP_OP_INTERACT_ACROSS_PROFILES, // OP_INTERACT_ACROSS_PROFILES
		AppProtoEnums.APP_OP_ACTIVATE_PLATFORM_VPN, // OP_ACTIVATE_PLATFORM_VPN
		AppProtoEnums.APP_OP_LOADER_USAGE_STATS, // OP_LOADER_USAGE_STATS
		AppProtoEnums.APP_OP_ACCESS_CALL_AUDIO, // OP_ACCESS_CALL_AUDIO
		AppProtoEnums.APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,
		// OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		AppProtoEnums.APP_OP_AUTO_REVOKE_MANAGED_BY_INSTALLER
		//OP_AUTO_REVOKE_MANAGED_BY_INSTALLER
		};


		/**
		* Mapping from an app op name to the app op code.
		*/
		@@ -2374,6 +2482,10 @@ public class AppOpsManager {
		throw new IllegalStateException("sOpToString length " + sOpToString.length
		+ " should be " + _NUM_OP);
		}
		if (sOpToLoggingId.length != _NUM_OP) {
		throw new IllegalStateException("sOpToLoggingId length " + sOpToLoggingId.length
		+ " should be " + _NUM_OP);
		}
		if (sOpNames.length != _NUM_OP) {
		throw new IllegalStateException("sOpNames length " + sOpNames.length
		+ " should be " + _NUM_OP);
		@@ -2457,6 +2569,15 @@ public class AppOpsManager {
		return sOpToString[op];
		}

		/**
		* Retrieve a logging id for the operation.
		*
		* @hide
		*/
		public static int opToLoggingId(int op) {
		return sOpToLoggingId[op];
		}

		/**
		* @hide
		*/
		@@ -5911,6 +6032,11 @@ public class AppOpsManager {
		return mOp;
		}

		/** @hide */
		public int getLoggingOpCode() {
		return AppOpsManager.opToLoggingId(mOp);
		}

		/**
		* Gets the number times the op was accessed (performed) in the foreground.
		*