Snap for 4972147 from fcb7982a492413dd928433bfb73ae2ca1e222397 to pi-qpr1-release (f766c366) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+48 −1

Original line number	Diff line number	Diff line
		@@ -302,6 +302,7 @@ status_t BootAnimation::readyToRun() {
		mHeight = h;
		mFlingerSurfaceControl = control;
		mFlingerSurface = s;
		mTargetInset = -1;

		// If the device has encryption turned on or is in process
		// of being encrypted we show the encrypted boot animation.
		@@ -942,6 +943,7 @@ bool BootAnimation::playAnimation(const Animation& animation)
		if (mClockEnabled && mTimeIsAccurate && validClock(part)) {
		drawClock(animation.clockFont, part.clockPosX, part.clockPosY);
		}
		handleViewport(frameDuration);

		eglSwapBuffers(mDisplay, mSurface);

		@@ -966,7 +968,7 @@ bool BootAnimation::playAnimation(const Animation& animation)
		usleep(part.pause * ns2us(frameDuration));

		// For infinite parts, we've now played them at least once, so perhaps exit
		if(exitPending() && !part.count)
		if(exitPending() && !part.count && mCurrentInset >= mTargetInset)
		break;
		}

		@@ -986,6 +988,51 @@ bool BootAnimation::playAnimation(const Animation& animation)
		return true;
		}

		void BootAnimation::handleViewport(nsecs_t timestep) {
		if (mShuttingDown \|\| !mFlingerSurfaceControl \|\| mTargetInset == 0) {
		return;
		}
		if (mTargetInset < 0) {
		// Poll the amount for the top display inset. This will return -1 until persistent properties
		// have been loaded.
		mTargetInset = android::base::GetIntProperty("persist.sys.displayinset.top",
		-1 /* default /, -1 / min /, mHeight / 2 / max */);
		}
		if (mTargetInset <= 0) {
		return;
		}

		if (mCurrentInset < mTargetInset) {
		// After the device boots, the inset will effectively be cropped away. We animate this here.
		float fraction = static_cast<float>(mCurrentInset) / mTargetInset;
		int interpolatedInset = (cosf((fraction + 1) * M_PI) / 2.0f + 0.5f) * mTargetInset;

		SurfaceComposerClient::Transaction()
		.setCrop(mFlingerSurfaceControl, Rect(0, interpolatedInset, mWidth, mHeight))
		.apply();
		} else {
		// At the end of the animation, we switch to the viewport that DisplayManager will apply
		// later. This changes the coordinate system, and means we must move the surface up by
		// the inset amount.
		sp<IBinder> dtoken(SurfaceComposerClient::getBuiltInDisplay(
		ISurfaceComposer::eDisplayIdMain));

		Rect layerStackRect(0, 0, mWidth, mHeight - mTargetInset);
		Rect displayRect(0, mTargetInset, mWidth, mHeight);

		SurfaceComposerClient::Transaction t;
		t.setPosition(mFlingerSurfaceControl, 0, -mTargetInset)
		.setCrop(mFlingerSurfaceControl, Rect(0, mTargetInset, mWidth, mHeight));
		t.setDisplayProjection(dtoken, 0 /* orientation */, layerStackRect, displayRect);
		t.apply();

		mTargetInset = mCurrentInset = 0;
		}

		int delta = timestep * mTargetInset / ms2ns(200);
		mCurrentInset += delta;
		}

		void BootAnimation::releaseAnimation(Animation* animation) const
		{
		for (Vector<Animation::Part>::iterator it = animation->parts.begin(),

cmds/bootanimation/BootAnimation.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -157,11 +157,15 @@ private:

		void checkExit();

		void handleViewport(nsecs_t timestep);

		sp<SurfaceComposerClient> mSession;
		AssetManager mAssets;
		Texture mAndroid[2];
		int mWidth;
		int mHeight;
		int mCurrentInset;
		int mTargetInset;
		bool mUseNpotTextures = false;
		EGLDisplay mDisplay;
		EGLDisplay mContext;

core/java/android/app/ActivityManagerInternal.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -413,4 +413,9 @@ public abstract class ActivityManagerInternal {
		* @return The intent used to launch the home activity.
		*/
		public abstract Intent getHomeIntent();

		/**
		* WindowManager notifies AM when display size of the default display changes.
		*/
		public abstract void notifyDefaultDisplaySizeChanged();
		}

core/java/android/app/ActivityThread.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ import com.android.internal.os.RuntimeInit;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.FastPrintWriter;
		import com.android.internal.util.Preconditions;
		import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.org.conscrypt.OpenSSLSocketImpl;
		import com.android.org.conscrypt.TrustedCertificateStore;
		@@ -5144,6 +5145,16 @@ public final class ActivityThread extends ClientTransactionHandler {
		}
		}

		/**
		* Updates the application info.
		*
		* This only works in the system process. Must be called on the main thread.
		*/
		public void handleSystemApplicationInfoChanged(@NonNull ApplicationInfo ai) {
		Preconditions.checkState(mSystemThread, "Must only be called in the system process");
		handleApplicationInfoChanged(ai);
		}

		void handleApplicationInfoChanged(@NonNull final ApplicationInfo ai) {
		// Updates triggered by package installation go through a package update
		// receiver. Here we try to capture ApplicationInfo changes that are

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -266,9 +266,12 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
		\|\| mEstimate.estimateMillis < mSevereWarningThreshold) {
		nb.setColor(Utils.getColorAttr(mContext, android.R.attr.colorError));
		}

		if (!mPowerMan.isPowerSaveMode()) {
		nb.addAction(0,
		mContext.getString(R.string.battery_saver_start_action),
		pendingBroadcast(ACTION_START_SAVER));
		}
		nb.setOnlyAlertOnce(!mPlaySound);
		mPlaySound = false;
		SystemUI.overrideNotificationAppName(mContext, nb, false);