Merge commit 'goog/master' into master_gl (77307ab8) · Commits · e / os / android_frameworks_base

api/current.xml

+21 −0

Original line number	Diff line number	Diff line
		@@ -95163,6 +95163,17 @@
		visibility="public"
		>
		</field>
		<field name="ALARM_ALERT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""alarm_alert""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ALWAYS_FINISH_ACTIVITIES"
		type="java.lang.String"
		transient="false"
		@@ -95283,6 +95294,16 @@
		visibility="public"
		>
		</field>
		<field name="DEFAULT_ALARM_ALERT_URI"
		type="android.net.Uri"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="DEFAULT_NOTIFICATION_URI"
		type="android.net.Uri"
		transient="false"

core/java/android/preference/RingtonePreference.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,9 @@ import android.util.Log;
		* The chosen ringtone's URI will be persisted as a string.
		* <p>
		* If the user chooses the "Default" item, the saved string will be one of
		* {@link System#DEFAULT_RINGTONE_URI} or
		* {@link System#DEFAULT_NOTIFICATION_URI}. If the user chooses the "Silent"
		* {@link System#DEFAULT_RINGTONE_URI},
		* {@link System#DEFAULT_NOTIFICATION_URI}, or
		* {@link System#DEFAULT_ALARM_ALERT_URI}. If the user chooses the "Silent"
		* item, the saved string will be an empty string.
		*
		* @attr ref android.R.styleable#RingtonePreference_ringtoneType

core/java/android/preference/VolumePreference.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.database.ContentObserver;
		import android.media.Ringtone;
		import android.media.RingtoneManager;
		import android.media.AudioManager;
		import android.net.Uri;
		import android.os.Handler;
		import android.preference.PreferenceManager;
		import android.provider.Settings;
		@@ -147,10 +148,16 @@ public class VolumePreference extends SeekBarPreference implements
		System.getUriFor(System.VOLUME_SETTINGS[mStreamType]),
		false, mVolumeObserver);

		mRingtone = RingtoneManager.getRingtone(mContext,
		mStreamType == AudioManager.STREAM_NOTIFICATION
		? Settings.System.DEFAULT_NOTIFICATION_URI
		: Settings.System.DEFAULT_RINGTONE_URI);
		Uri defaultUri = null;
		if (mStreamType == AudioManager.STREAM_RING) {
		defaultUri = Settings.System.DEFAULT_RINGTONE_URI;
		} else if (mStreamType == AudioManager.STREAM_NOTIFICATION) {
		defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI;
		} else {
		defaultUri = Settings.System.DEFAULT_ALARM_ALERT_URI;
		}

		mRingtone = RingtoneManager.getRingtone(mContext, defaultUri);
		mRingtone.setStreamType(mStreamType);
		}

core/java/android/provider/Settings.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -1181,6 +1181,22 @@ public final class Settings {
		*/
		public static final Uri DEFAULT_NOTIFICATION_URI = getUriFor(NOTIFICATION_SOUND);

		/**
		* Persistent store for the system-wide default alarm alert.
		*
		* @see #RINGTONE
		* @see #DEFAULT_ALARM_ALERT_URI
		*/
		public static final String ALARM_ALERT = "alarm_alert";

		/**
		* A {@link Uri} that will point to the current default alarm alert at
		* any given time.
		*
		* @see #DEFAULT_ALARM_ALERT_URI
		*/
		public static final Uri DEFAULT_ALARM_ALERT_URI = getUriFor(ALARM_ALERT);

		/**
		* Setting to enable Auto Replace (AutoText) in text editors. 1 = On, 0 = Off
		*/

core/java/android/webkit/JWebCoreJavaBridge.java

+28 −8

Original line number	Diff line number	Diff line
		@@ -34,9 +34,13 @@ final class JWebCoreJavaBridge extends Handler {
		// Instant timer is used to implement a timer that needs to fire almost
		// immediately.
		private boolean mHasInstantTimer;

		// Reference count the pause/resume of timers
		private int mPauseTimerRefCount;

		private boolean mTimerPaused;
		private boolean mHasDeferredTimers;

		/**
		* Construct a new JWebCoreJavaBridge to interface with
		* WebCore timers and cookies.
		@@ -50,6 +54,17 @@ final class JWebCoreJavaBridge extends Handler {
		nativeFinalize();
		}

		/**
		* Call native timer callbacks.
		*/
		private void fireSharedTimer() {
		PerfChecker checker = new PerfChecker();
		// clear the flag so that sharedTimerFired() can set a new timer
		mHasInstantTimer = false;
		sharedTimerFired();
		checker.responseAlert("sharedTimer");
		}

		/**
		* handleMessage
		* @param msg The dispatched message.
		@@ -60,11 +75,11 @@ final class JWebCoreJavaBridge extends Handler {
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case TIMER_MESSAGE: {
		PerfChecker checker = new PerfChecker();
		// clear the flag so that sharedTimerFired() can set a new timer
		mHasInstantTimer = false;
		sharedTimerFired();
		checker.responseAlert("sharedTimer");
		if (mTimerPaused) {
		mHasDeferredTimers = true;
		} else {
		fireSharedTimer();
		}
		break;
		}
		case FUNCPTR_MESSAGE:
		@@ -86,7 +101,8 @@ final class JWebCoreJavaBridge extends Handler {
		*/
		public void pause() {
		if (--mPauseTimerRefCount == 0) {
		setDeferringTimers(true);
		mTimerPaused = true;
		mHasDeferredTimers = false;
		}
		}

		@@ -95,7 +111,11 @@ final class JWebCoreJavaBridge extends Handler {
		*/
		public void resume() {
		if (++mPauseTimerRefCount == 1) {
		setDeferringTimers(false);
		mTimerPaused = false;
		if (mHasDeferredTimers) {
		mHasDeferredTimers = false;
		fireSharedTimer();
		}
		}
		}

		@@ -185,11 +205,11 @@ final class JWebCoreJavaBridge extends Handler {
		}
		removeMessages(TIMER_MESSAGE);
		mHasInstantTimer = false;
		mHasDeferredTimers = false;
		}

		private native void nativeConstructor();
		private native void nativeFinalize();
		private native void sharedTimerFired();
		private native void setDeferringTimers(boolean defer);
		public native void setNetworkOnLine(boolean online);
		}