Snap for 5800161 from 0e3973b1b04742e008a67b804d68e0b48225a0c8 to qt-qpr1-release (5dade4a9) · Commits · e / os / android_frameworks_base

cmds/bootanimation/bootanim.rc

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,4 +4,5 @@ service bootanim /system/bin/bootanimation
		group graphics audio
		disabled
		oneshot
		ioprio rt 0
		writepid /dev/stune/top-app/tasks

core/java/android/app/slice/SliceProvider.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ public abstract class SliceProvider extends ContentProvider {
		@Override
		public Bundle call(String method, String arg, Bundle extras) {
		if (method.equals(METHOD_SLICE)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS);

		String callingPackage = getCallingPackage();
		@@ -369,7 +370,7 @@ public abstract class SliceProvider extends ContentProvider {
		} else if (method.equals(METHOD_MAP_INTENT)) {
		Intent intent = extras.getParcelable(EXTRA_INTENT);
		if (intent == null) return null;
		Uri uri = onMapIntentToUri(intent);
		Uri uri = validateIncomingUriOrNull(onMapIntentToUri(intent));
		List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS);
		Bundle b = new Bundle();
		if (uri != null) {
		@@ -383,24 +384,27 @@ public abstract class SliceProvider extends ContentProvider {
		} else if (method.equals(METHOD_MAP_ONLY_INTENT)) {
		Intent intent = extras.getParcelable(EXTRA_INTENT);
		if (intent == null) return null;
		Uri uri = onMapIntentToUri(intent);
		Uri uri = validateIncomingUriOrNull(onMapIntentToUri(intent));
		Bundle b = new Bundle();
		b.putParcelable(EXTRA_SLICE, uri);
		return b;
		} else if (method.equals(METHOD_PIN)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		throw new SecurityException("Only the system can pin/unpin slices");
		}
		handlePinSlice(uri);
		} else if (method.equals(METHOD_UNPIN)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		throw new SecurityException("Only the system can pin/unpin slices");
		}
		handleUnpinSlice(uri);
		} else if (method.equals(METHOD_GET_DESCENDANTS)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(
		validateIncomingUriOrNull(extras.getParcelable(EXTRA_BIND_URI)));
		Bundle b = new Bundle();
		b.putParcelableArrayList(EXTRA_SLICE_DESCENDANTS,
		new ArrayList<>(handleGetDescendants(uri)));
		@@ -416,6 +420,10 @@ public abstract class SliceProvider extends ContentProvider {
		return super.call(method, arg, extras);
		}

		private Uri validateIncomingUriOrNull(Uri uri) {
		return uri == null ? null : validateIncomingUri(uri);
		}

		private Collection<Uri> handleGetDescendants(Uri uri) {
		mCallback = "onGetSliceDescendants";
		return onGetSliceDescendants(uri);

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.UnlockMethodCache;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.util.AsyncSensorManager;
		import com.android.systemui.util.InjectionInflationController;
		import com.android.systemui.util.leak.GarbageMonitor;
		@@ -144,9 +145,9 @@ public class SystemUIFactory {
		LockscreenWallpaper lockscreenWallpaper,
		TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,
		Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,
		AlarmManager alarmManager) {
		AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {
		return new ScrimController(scrimBehind, scrimInFront, scrimStateListener,
		scrimVisibleListener, dozeParameters, alarmManager);
		scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);
		}

		public NotificationIconAreaController createNotificationIconAreaController(Context context,

packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ public class DozeSensors {
		final AlarmTimeout mCooldownTimer;
		final AlwaysOnDisplayPolicy mPolicy;
		final Sensor mSensor;
		final boolean mUsingBrightnessSensor;

		public ProxSensor(AlwaysOnDisplayPolicy policy) {
		mPolicy = policy;
		@@ -298,6 +299,7 @@ public class DozeSensors {
		// if available.
		Sensor sensor = DozeSensors.findSensorWithType(mSensorManager,
		mContext.getString(R.string.doze_brightness_sensor_type));
		mUsingBrightnessSensor = sensor != null;
		if (sensor == null) {
		sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
		}
		@@ -327,8 +329,7 @@ public class DozeSensors {
		return;
		}
		if (register) {
		mRegistered = mSensorManager.registerListener(this,
		mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY),
		mRegistered = mSensorManager.registerListener(this, mSensor,
		SensorManager.SENSOR_DELAY_NORMAL, mHandler);
		} else {
		mSensorManager.unregisterListener(this);
		@@ -341,7 +342,13 @@ public class DozeSensors {
		public void onSensorChanged(android.hardware.SensorEvent event) {
		if (DEBUG) Log.d(TAG, "onSensorChanged " + event);

		if (mUsingBrightnessSensor) {
		// The custom brightness sensor is gated by the proximity sensor and will return 0
		// whenever prox is covered.
		mCurrentlyFar = event.values[0] > 0;
		} else {
		mCurrentlyFar = event.values[0] >= event.sensor.getMaximumRange();
		}
		mProxCallback.accept(mCurrentlyFar);

		long now = SystemClock.elapsedRealtime();

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -296,11 +296,14 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
		mY = y - containerLocation[1];
		}

		private final Callback mKeyguardCallback = () -> {
		private final Callback mKeyguardCallback = new Callback() {
		@Override
		public void onKeyguardShowingChanged() {
		if (!isAttachedToWindow()) return;
		if (Dependency.get(KeyguardMonitor.class).isShowing() && !mOpening) {
		hide();
		}
		}
		};

		private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() {