Snap for 10242133 from cf2e76555e377bbacc93b91a75afe1be0da3edfb to udc-release (0d6d89e7) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/UserProperties.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ public final class UserProperties implements Parcelable {
		* device policies from its parent profile.
		*
		*<p> All the user restrictions and device policies would be not propagated to the profile
		* with this property value. The {(TODO:b/256978256) @link DevicePolicyEngine}
		* with this property value. The {@link com.android.server.devicepolicy.DevicePolicyEngine}
		* uses this property to determine and propagate only select ones to the given profile.
		*
		* @hide

core/java/android/net/VpnManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@ public class VpnManager {
		* Retrieve the VpnProfileState for the profile provisioned by the calling package.
		*
		* @return the VpnProfileState with current information, or null if there was no profile
		* provisioned by the calling package.
		* provisioned and started by the calling package.
		*/
		@Nullable
		public VpnProfileState getProvisionedVpnProfileState() {

core/java/android/os/UserManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ public class UserManager {
		* The default value is <code>false</code>.
		*
		* <p>Holders of the permission
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}
		* can set this restriction using the DevicePolicyManager APIs mentioned below.
		*
		* <p>Key for user restrictions.
		@@ -941,7 +941,7 @@ public class UserManager {
		* this restriction will be set as a base restriction which cannot be removed by any admin.
		*
		* <p>Holders of the permission
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}
		* can set this restriction using the DevicePolicyManager APIs mentioned below.
		*
		* <p>Key for user restrictions.
		@@ -1451,7 +1451,7 @@ public class UserManager {
		* affected. The default value is <code>false</code>.
		*
		* <p>Holders of the permission
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}
		* can set this restriction using the DevicePolicyManager APIs mentioned below.
		*
		* <p>Key for user restrictions.
		@@ -1597,7 +1597,7 @@ public class UserManager {
		* set.
		*
		* <p>Holders of the permission
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}
		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}
		* can set this restriction using the DevicePolicyManager APIs mentioned below.
		*
		* <p>The default value is <code>false</code>.

core/java/android/view/ViewRootImpl.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -2426,7 +2426,7 @@ public final class ViewRootImpl implements ViewParent,
		*
		* @hide
		*/
		void notifyRendererOfExpensiveFrame() {
		public void notifyRendererOfExpensiveFrame() {
		if (mAttachInfo.mThreadedRenderer != null) {
		mAttachInfo.mThreadedRenderer.notifyExpensiveFrame();
		}
		@@ -7017,6 +7017,10 @@ public final class ViewRootImpl implements ViewParent,
		private int processPointerEvent(QueuedInputEvent q) {
		final MotionEvent event = (MotionEvent)q.mEvent;
		boolean handled = mHandwritingInitiator.onTouchEvent(event);
		if (handled) {
		// If handwriting is started, toolkit doesn't receive ACTION_UP.
		mLastClickToolType = event.getToolType(event.getActionIndex());
		}

		mAttachInfo.mUnbufferedDispatchRequested = false;
		mAttachInfo.mHandlingPointerEvent = true;

core/java/android/window/TransitionInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -424,8 +424,8 @@ public final class TransitionInfo implements Parcelable {
		case TRANSIT_NONE: return "NONE";
		case TRANSIT_OPEN: return "OPEN";
		case TRANSIT_CLOSE: return "CLOSE";
		case TRANSIT_TO_FRONT: return "SHOW";
		case TRANSIT_TO_BACK: return "HIDE";
		case TRANSIT_TO_FRONT: return "TO_FRONT";
		case TRANSIT_TO_BACK: return "TO_BACK";
		case TRANSIT_CHANGE: return "CHANGE";
		default: return "<unknown:" + mode + ">";
		}