Merge "Fix issue #5229575: Youtube link shared through messaging is not..." (69666e07) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1291,7 +1291,8 @@ public final class ActivityThread {
		public final boolean queueIdle() {
		ActivityClientRecord a = mNewActivities;
		boolean stopProfiling = false;
		if (mBoundApplication.profileFd != null && mBoundApplication.autoStopProfiler) {
		if (mBoundApplication != null && mBoundApplication.profileFd != null
		&& mBoundApplication.autoStopProfiler) {
		stopProfiling = true;
		}
		if (a != null) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -871,6 +871,12 @@ public interface WindowManagerPolicy {
		*/
		public void systemReady();

		/**
		* Called when the system is done booting to the point where the
		* user can start interacting with it.
		*/
		public void systemBooted();

		/**
		* Show boot time message to the user.
		*/

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,4 +29,7 @@
		android:fillEnabled="true" android:fillAfter="true"
		android:interpolator="@interpolator/decelerate_quint"
		android:duration="300" />
		<!-- This is needed to keep the animation running while wallpaper_close_enter completes -->
		<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
		android:duration="600" />
		</set>
		No newline at end of file

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,5 +29,7 @@
		android:interpolator="@interpolator/accelerate_quint"
		android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
		android:duration="200" />

		<!-- This is needed to keep the animation running while wallpaper_open_enter completes -->
		<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
		android:duration="500" />
		</set>
		No newline at end of file

+15 −1

Original line number	Diff line number	Diff line
		@@ -267,6 +267,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		int mLidOpen = LID_ABSENT;

		boolean mSystemReady;
		boolean mSystemBooted;
		boolean mHdmiPlugged;
		int mUiMode = Configuration.UI_MODE_TYPE_NORMAL;
		int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED;
		@@ -2497,6 +2498,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mKeyguardMediator.isShowingAndNotHidden() :
		mKeyguardMediator.isShowing());

		if (!mSystemBooted) {
		// If we have not yet booted, don't let key events do anything.
		return 0;
		}

		if (false) {
		Log.d(TAG, "interceptKeyTq keycode=" + keyCode
		+ " screenIsOn=" + isScreenOn + " keyguardActive=" + keyguardActive);
		@@ -3100,6 +3106,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		/** {@inheritDoc} */
		public void systemBooted() {
		synchronized (mLock) {
		mSystemBooted = true;
		}
		}

		ProgressDialog mBootMsgDialog = null;

		/** {@inheritDoc} */
		@@ -3492,7 +3505,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		public void dump(String prefix, FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode);
		pw.print(" mSystemRead="); pw.println(mSystemReady);
		pw.print(" mSystemReady="); pw.print(mSystemReady);
		pw.print(" mSystemBooted="); pw.println(mSystemBooted);
		pw.print(prefix); pw.print("mLidOpen="); pw.print(mLidOpen);
		pw.print(" mLidOpenRotation="); pw.print(mLidOpenRotation);
		pw.print(" mHdmiPlugged="); pw.println(mHdmiPlugged);