Snap for 8540474 from aca0a9e9e045d2faa78f18af9b39523d1edc00fb to tm-release (8ab1d19f) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+49 −0

Original line number	Diff line number	Diff line
		@@ -3374,6 +3374,55 @@ public class DevicePolicyManager {
		public static final int
		RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED = 3;

		/**
		* An {@code int} extra that specifies one of {@link
		* #ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FAIL_PROVISIONING} or {@link
		* #ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FALLBACK_TO_PLATFORM_PROVISIONING}.
		*
		* <p>The failure strategy specifies how the platform should handle a failed device policy
		* management role holder update via {@link
		* #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} when {@link
		* #EXTRA_PROVISIONING_ALLOW_OFFLINE} is not set or set to {@code false}.
		*
		* <p>This extra may be supplied as part of the {@link
		* #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} result intent.
		*
		* <p>Default value is {@link #ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FAIL_PROVISIONING}.
		*
		* @hide
		*/
		public static final String EXTRA_ROLE_HOLDER_UPDATE_FAILURE_STRATEGY =
		"android.app.extra.ROLE_HOLDER_UPDATE_FAILURE_STRATEGY";

		/**
		* Possible values for {@link #EXTRA_ROLE_HOLDER_UPDATE_FAILURE_STRATEGY}.
		*
		* @hide
		*/
		@IntDef(prefix = { "ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_" }, value = {
		ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FAIL_PROVISIONING,
		ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FALLBACK_TO_PLATFORM_PROVISIONING
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface RoleHolderUpdateFailureStrategy {}

		/**
		* A value for {@link #EXTRA_ROLE_HOLDER_UPDATE_FAILURE_STRATEGY} indicating that upon
		* failure to update the role holder, provisioning should fail.
		*
		* @hide
		*/
		public static final int ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FAIL_PROVISIONING = 1;

		/**
		* A value for {@link #EXTRA_ROLE_HOLDER_UPDATE_FAILURE_STRATEGY} indicating that upon
		* failure to update the role holder, provisioning should fallback to be platform-driven.
		*
		* @hide
		*/
		public static final int ROLE_HOLDER_UPDATE_FAILURE_STRATEGY_FALLBACK_TO_PLATFORM_PROVISIONING =
		2;

		/**
		* An {@code int} extra which contains the result code of the last attempt to update
		* the device policy management role holder via {@link

core/java/android/app/admin/DevicePolicyResources.java

+56 −1

Original line number	Diff line number	Diff line
		@@ -1173,7 +1173,62 @@ public final class DevicePolicyResources {
		/**
		* Header for items under the personal user
		*/
		public static final String PERSONAL_CATEGORY_HEADER = PREFIX + "category_personal";
		public static final String PERSONAL_CATEGORY_HEADER = PREFIX + "CATEGORY_PERSONAL";

		/**
		* Text to indicate work notification content will be shown on the lockscreen.
		*/
		public static final String LOCK_SCREEN_SHOW_WORK_NOTIFICATION_CONTENT =
		PREFIX + "LOCK_SCREEN_SHOW_WORK_NOTIFICATION_CONTENT";

		/**
		* Text to indicate work notification content will be shown on the lockscreen.
		*/
		public static final String LOCK_SCREEN_HIDE_WORK_NOTIFICATION_CONTENT =
		PREFIX + "LOCK_SCREEN_HIDE_WORK_NOTIFICATION_CONTENT";

		/**
		* Text for toggle to enable auto-sycing personal data
		*/
		public static final String AUTO_SYNC_PERSONAL_DATA = PREFIX
		+ "AUTO_SYNC_PERSONAL_DATA";

		/**
		* Text for toggle to enable auto-sycing work data
		*/
		public static final String AUTO_SYNC_WORK_DATA = PREFIX
		+ "AUTO_SYNC_WORK_DATA";

		/**
		* Summary for "More security settings" section when a work profile is on the device.
		*/
		public static final String MORE_SECURITY_SETTINGS_WORK_PROFILE_SUMMARY = PREFIX
		+ "MORE_SECURITY_SETTINGS_WORK_PROFILE_SUMMARY";

		/**
		* Title for screen asking the user to choose a type of screen lock (such as a pattern,
		* PIN, or password) that they need to enter to use their work apps
		*/
		public static final String LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE = PREFIX
		+ "LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE";

		/**
		* Title for section listing information that can be seen by organization
		*/
		public static final String INFORMATION_SEEN_BY_ORGANIZATION_TITLE = PREFIX
		+ "information_seen_by_organization_title";

		/**
		* Title for section listing changes made by the organization.
		*/
		public static final String CHANGES_BY_ORGANIZATION_TITLE =
		PREFIX + "CHANGES_BY_ORGANIZATION_TITLE";

		/**
		* Footer for enterprise privacy screen.
		*/
		public static final String ENTERPRISE_PRIVACY_FOOTER =
		PREFIX + "ENTERPRISE_PRIVACY_FOOTER";
		}

		/**

core/java/android/os/logcat/ILogcatManagerService.aidl

+0 −27

Original line number	Diff line number	Diff line
		@@ -42,31 +42,4 @@ oneway interface ILogcatManagerService {
		* @param fd The FD (Socket) of client who makes the request.
		*/
		void finishThread(in int uid, in int gid, in int pid, in int fd);


		/**
		* The function is called by UX component to notify
		* LogcatManagerService that the user approved
		* the privileged log data access.
		*
		* @param uid The UID of client who makes the request.
		* @param gid The GID of client who makes the request.
		* @param pid The PID of client who makes the request.
		* @param fd The FD (Socket) of client who makes the request.
		*/
		void approve(in int uid, in int gid, in int pid, in int fd);


		/**
		* The function is called by UX component to notify
		* LogcatManagerService that the user declined
		* the privileged log data access.
		*
		* @param uid The UID of client who makes the request.
		* @param gid The GID of client who makes the request.
		* @param pid The PID of client who makes the request.
		* @param fd The FD (Socket) of client who makes the request.
		*/
		void decline(in int uid, in int gid, in int pid, in int fd);
		}

core/java/android/preference/SeekBarVolumizer.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -68,9 +68,18 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
		void onMuted(boolean muted, boolean zenMuted);
		/**
		* Callback reporting that the seek bar is start tracking.
		*
		* @param sbv - The seek bar that start tracking
		*/
		void onStartTrackingTouch(SeekBarVolumizer sbv);

		/**
		* Callback reporting that the seek bar is stop tracking.
		*
		* @param sbv - The seek bar that stop tracking
		*/
		default void onStopTrackingTouch(SeekBarVolumizer sbv) {
		}
		}

		private static final int MSG_GROUP_VOLUME_CHANGED = 1;
		@@ -451,6 +460,9 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba

		public void onStopTrackingTouch(SeekBar seekBar) {
		postStartSample();
		if (mCallback != null) {
		mCallback.onStopTrackingTouch(this);
		}
		}

		public boolean isSamplePlaying() {

core/java/android/provider/Settings.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -7232,13 +7232,6 @@ public final class Settings {
		*/
		public static final String LOCATION_SHOW_SYSTEM_OPS = "locationShowSystemOps";


		/**
		* Whether or not an indicator experiment has started.
		* @hide
		*/
		public static final String LOCATION_INDICATOR_EXPERIMENT_STARTED =
		"locationIndicatorExperimentStarted";
		/**
		* A flag containing settings used for biometric weak
		* @hide