Snap for 7753165 from 44e5c9a0f5ba24dfc5ae54ae25a9c6d3e6e0ae22 to sc-qpr1-release (4146a63b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -771,6 +771,11 @@ public class ActivityManager {
		return procState >= PROCESS_STATE_TRANSIENT_BACKGROUND;
		}

		/** @hide Should this process state be considered in the cache? */
		public static final boolean isProcStateCached(int procState) {
		return procState >= PROCESS_STATE_CACHED_ACTIVITY;
		}

		/** @hide Is this a foreground service type? */
		public static boolean isForegroundService(int procState) {
		return procState == PROCESS_STATE_FOREGROUND_SERVICE;

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -263,12 +263,12 @@ public final class CameraExtensionCharacteristics {
		@Override
		public void onServiceConnected(ComponentName component, IBinder binder) {
		mProxy = ICameraExtensionsProxyService.Stub.asInterface(binder);
		mInitFuture.setStatus(true);
		try {
		mSupportsAdvancedExtensions = mProxy.advancedExtensionsSupported();
		} catch (RemoteException e) {
		Log.e(TAG, "Remote IPC failed!");
		}
		mInitFuture.setStatus(true);
		}
		};
		ctx.bindService(intent, Context.BIND_AUTO_CREATE \| Context.BIND_IMPORTANT \|

core/java/android/speech/RecognitionService.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ public abstract class RecognitionService extends Service {
		@NonNull AttributionSource attributionSource) {
		try {
		if (mCurrentCallback == null) {
		boolean preflightPermissionCheckPassed = checkPermissionForPreflight(
		boolean preflightPermissionCheckPassed = checkPermissionForPreflightNotHardDenied(
		attributionSource);
		if (preflightPermissionCheckPassed) {
		if (DBG) {
		@@ -470,10 +470,11 @@ public abstract class RecognitionService extends Service {
		return mStartedDataDelivery;
		}

		private boolean checkPermissionForPreflight(AttributionSource attributionSource) {
		return PermissionChecker.checkPermissionForPreflight(RecognitionService.this,
		Manifest.permission.RECORD_AUDIO, attributionSource)
		== PermissionChecker.PERMISSION_GRANTED;
		private boolean checkPermissionForPreflightNotHardDenied(AttributionSource attributionSource) {
		int result = PermissionChecker.checkPermissionForPreflight(RecognitionService.this,
		Manifest.permission.RECORD_AUDIO, attributionSource);
		return result == PermissionChecker.PERMISSION_GRANTED
		\|\| result == PermissionChecker.PERMISSION_SOFT_DENIED;
		}

		void finishDataDelivery() {

core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml

+6 −42

Original line number	Diff line number	Diff line
		@@ -18,19 +18,10 @@
		-->
		<!-- This should be kept in sync with task_open_enter.xml -->
		<set xmlns:android="http://schemas.android.com/apk/res/android"
		android:hasRoundedCorners="true"
		android:shareInterpolator="false"
		android:zAdjustment="top">

		<alpha
		android:fromAlpha="1"
		android:toAlpha="1.0"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/linear"
		android:startOffset="67"
		android:duration="217"/>
		android:zAdjustment="top"
		android:hasRoundedCorners="true"
		android:background="@color/overview_background">

		<translate
		android:fromXDelta="-105%"
		@@ -38,36 +29,9 @@
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/aggressive_ease"
		android:startOffset="50"
		android:duration="383"/>

		<scale
		android:fromXScale="1.0526"
		android:toXScale="1"
		android:fromYScale="1.0526"
		android:toYScale="1"
		android:pivotX="50%"
		android:pivotY="50%"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/fast_out_slow_in"
		android:duration="283"/>

		<scale
		android:fromXScale="0.95"
		android:toXScale="1"
		android:fromYScale="0.95"
		android:toYScale="1"
		android:pivotX="50%"
		android:pivotY="50%"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/fast_out_slow_in"
		android:startOffset="283"
		android:duration="317"/>
		android:interpolator="@interpolator/fast_out_extra_slow_in"
		android:startOffset="0"
		android:duration="500"/>

		<!-- To keep the thumbnail around longer and fade out the thumbnail -->
		<alpha android:fromAlpha="1.0" android:toAlpha="0"

core/res/res/anim-ldrtl/task_close_enter.xml

+7 −44

Original line number	Diff line number	Diff line
		@@ -17,17 +17,7 @@
		android:shareInterpolator="false"
		android:zAdjustment="top"
		android:hasRoundedCorners="true"
		android:showWallpaper="true">

		<alpha
		android:fromAlpha="1"
		android:toAlpha="1.0"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/linear"
		android:startOffset="67"
		android:duration="217"/>
		android:background="@color/overview_background">

		<translate
		android:fromXDelta="105%"
		@@ -35,34 +25,7 @@
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/aggressive_ease"
		android:startOffset="50"
		android:duration="383"/>

		<scale
		android:fromXScale="1.0526"
		android:toXScale="1"
		android:fromYScale="1.0526"
		android:toYScale="1"
		android:pivotX="50%"
		android:pivotY="50%"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/fast_out_slow_in"
		android:duration="283"/>

		<scale
		android:fromXScale="0.95"
		android:toXScale="1"
		android:fromYScale="0.95"
		android:toYScale="1"
		android:pivotX="50%"
		android:pivotY="50%"
		android:fillEnabled="true"
		android:fillBefore="true"
		android:fillAfter="true"
		android:interpolator="@interpolator/fast_out_slow_in"
		android:startOffset="283"
		android:duration="317"/>
		android:interpolator="@interpolator/fast_out_extra_slow_in"
		android:startOffset="0"
		android:duration="500"/>
		</set>
		No newline at end of file