Merge branch 'dr15' into cm-13.0 (7f6a0c2e) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -45134,7 +45134,10 @@ package java.lang.reflect {
		}

		public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
		method public boolean equals(java.lang.Object);
		method public A getAnnotation(java.lang.Class<A>);
		method public java.lang.annotation.Annotation[] getAnnotations();
		method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
		method public java.lang.Class<T> getDeclaringClass();
		method public java.lang.Class<?>[] getExceptionTypes();
		method public java.lang.reflect.Type[] getGenericExceptionTypes();
		@@ -45144,6 +45147,7 @@ package java.lang.reflect {
		method public java.lang.annotation.Annotation[][] getParameterAnnotations();
		method public java.lang.Class<?>[] getParameterTypes();
		method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
		method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
		method public boolean isSynthetic();
		method public boolean isVarArgs();
		method public T newInstance(java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.InstantiationException, java.lang.reflect.InvocationTargetException;
		@@ -45217,7 +45221,10 @@ package java.lang.reflect {
		}

		public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
		method public boolean equals(java.lang.Object);
		method public A getAnnotation(java.lang.Class<A>);
		method public java.lang.annotation.Annotation[] getAnnotations();
		method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
		method public java.lang.Class<?> getDeclaringClass();
		method public java.lang.Object getDefaultValue();
		method public java.lang.Class<?>[] getExceptionTypes();
		@@ -45231,6 +45238,7 @@ package java.lang.reflect {
		method public java.lang.Class<?> getReturnType();
		method public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
		method public java.lang.Object invoke(java.lang.Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
		method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
		method public boolean isBridge();
		method public boolean isSynthetic();
		method public boolean isVarArgs();

api/system-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@ package android {
		field public static final java.lang.String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS";
		field public static final java.lang.String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";
		field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
		field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS";
		field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";
		field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";
		field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
		@@ -32713,19 +32714,25 @@ package android.telecom {
		field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
		field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";
		field public static final java.lang.String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED";
		field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
		field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
		field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION";
		field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
		field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
		field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
		field public static final java.lang.String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";
		field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
		field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";
		field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
		field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		@@ -33425,6 +33432,7 @@ package android.telephony {
		field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
		field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
		field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
		field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
		field public static final int CALL_STATE_IDLE = 0; // 0x0
		field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
		field public static final int CALL_STATE_RINGING = 1; // 0x1
		@@ -33441,11 +33449,15 @@ package android.telephony {
		field public static final int DATA_CONNECTING = 1; // 0x1
		field public static final int DATA_DISCONNECTED = 0; // 0x0
		field public static final int DATA_SUSPENDED = 3; // 0x3
		field public static final java.lang.String EXTRA_CALL_VOICEMAIL_INTENT = "android.telephony.extra.CALL_VOICEMAIL_INTENT";
		field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
		field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_STATE = "state";
		field public static final java.lang.String EXTRA_STATE_IDLE;
		field public static final java.lang.String EXTRA_STATE_OFFHOOK;
		field public static final java.lang.String EXTRA_STATE_RINGING;
		field public static final java.lang.String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";
		field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
		field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
		field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
		@@ -47740,7 +47752,10 @@ package java.lang.reflect {
		}

		public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
		method public boolean equals(java.lang.Object);
		method public A getAnnotation(java.lang.Class<A>);
		method public java.lang.annotation.Annotation[] getAnnotations();
		method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
		method public java.lang.Class<T> getDeclaringClass();
		method public java.lang.Class<?>[] getExceptionTypes();
		method public java.lang.reflect.Type[] getGenericExceptionTypes();
		@@ -47750,6 +47765,7 @@ package java.lang.reflect {
		method public java.lang.annotation.Annotation[][] getParameterAnnotations();
		method public java.lang.Class<?>[] getParameterTypes();
		method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
		method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
		method public boolean isSynthetic();
		method public boolean isVarArgs();
		method public T newInstance(java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.InstantiationException, java.lang.reflect.InvocationTargetException;
		@@ -47823,7 +47839,10 @@ package java.lang.reflect {
		}

		public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
		method public boolean equals(java.lang.Object);
		method public A getAnnotation(java.lang.Class<A>);
		method public java.lang.annotation.Annotation[] getAnnotations();
		method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
		method public java.lang.Class<?> getDeclaringClass();
		method public java.lang.Object getDefaultValue();
		method public java.lang.Class<?>[] getExceptionTypes();
		@@ -47837,6 +47856,7 @@ package java.lang.reflect {
		method public java.lang.Class<?> getReturnType();
		method public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
		method public java.lang.Object invoke(java.lang.Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
		method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
		method public boolean isBridge();
		method public boolean isSynthetic();
		method public boolean isVarArgs();

core/java/android/app/ActivityThread.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -4269,6 +4269,11 @@ public final class ActivityThread {

		configDiff = mConfiguration.updateFrom(config);
		config = applyCompatConfiguration(mCurDefaultDisplayDpi);

		final Theme systemTheme = getSystemContext().getTheme();
		if ((systemTheme.getChangingConfigurations() & configDiff) != 0) {
		systemTheme.rebase();
		}
		}

		ArrayList<ComponentCallbacks2> callbacks = collectComponentCallbacks(false, config);

core/java/android/app/ActivityView.java

+112 −58

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.content.IIntentSender;
		import android.content.Intent;
		import android.content.IntentSender;
		import android.graphics.SurfaceTexture;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.IBinder;
		import android.os.Message;
		import android.os.OperationCanceledException;
		@@ -45,6 +43,17 @@ import android.view.WindowManager;
		import dalvik.system.CloseGuard;

		import java.lang.ref.WeakReference;
		import java.util.ArrayDeque;
		import java.util.concurrent.Executor;
		import java.util.concurrent.BlockingQueue;
		import java.util.concurrent.LinkedBlockingQueue;
		import java.util.concurrent.ThreadFactory;
		import java.util.concurrent.ThreadPoolExecutor;
		import java.util.concurrent.TimeUnit;
		import java.util.concurrent.atomic.AtomicInteger;

		import com.android.internal.annotations.GuardedBy;


		/** @hide */
		public class ActivityView extends ViewGroup {
		@@ -53,9 +62,64 @@ public class ActivityView extends ViewGroup {

		private static final int MSG_SET_SURFACE = 1;

		DisplayMetrics mMetrics = new DisplayMetrics();
		private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
		private static final int MINIMUM_POOL_SIZE = 1;
		private static final int MAXIMUM_POOL_SIZE = CPU_COUNT * 2 + 1;
		private static final int KEEP_ALIVE = 1;

		private static final ThreadFactory sThreadFactory = new ThreadFactory() {
		private final AtomicInteger mCount = new AtomicInteger(1);

		public Thread newThread(Runnable r) {
		return new Thread(r, "ActivityView #" + mCount.getAndIncrement());
		}
		};

		private static final BlockingQueue<Runnable> sPoolWorkQueue =
		new LinkedBlockingQueue<Runnable>(128);

		/**
		* An {@link Executor} that can be used to execute tasks in parallel.
		*/
		private static final Executor sExecutor = new ThreadPoolExecutor(MINIMUM_POOL_SIZE,
		MAXIMUM_POOL_SIZE, KEEP_ALIVE, TimeUnit.SECONDS, sPoolWorkQueue, sThreadFactory);


		private static class SerialExecutor implements Executor {
		private final ArrayDeque<Runnable> mTasks = new ArrayDeque<Runnable>();
		private Runnable mActive;

		public synchronized void execute(final Runnable r) {
		mTasks.offer(new Runnable() {
		public void run() {
		try {
		r.run();
		} finally {
		scheduleNext();
		}
		}
		});
		if (mActive == null) {
		scheduleNext();
		}
		}

		protected synchronized void scheduleNext() {
		if ((mActive = mTasks.poll()) != null) {
		sExecutor.execute(mActive);
		}
		}
		}

		private final SerialExecutor mExecutor = new SerialExecutor();

		private final int mDensityDpi;
		private final TextureView mTextureView;

		@GuardedBy("mActivityContainerLock")
		private ActivityContainerWrapper mActivityContainer;
		private Object mActivityContainerLock = new Object();

		private Activity mActivity;
		private int mWidth;
		private int mHeight;
		@@ -63,8 +127,6 @@ public class ActivityView extends ViewGroup {
		private int mLastVisibility;
		private ActivityViewCallback mActivityViewCallback;

		private HandlerThread mThread = new HandlerThread("ActivityViewThread");
		private Handler mHandler;

		public ActivityView(Context context) {
		this(context, null);
		@@ -97,28 +159,14 @@ public class ActivityView extends ViewGroup {
		+ e);
		}

		mThread.start();
		mHandler = new Handler(mThread.getLooper()) {
		@Override
		public void handleMessage(Message msg) {
		super.handleMessage(msg);
		if (msg.what == MSG_SET_SURFACE) {
		try {
		mActivityContainer.setSurface((Surface) msg.obj, msg.arg1, msg.arg2,
		mMetrics.densityDpi);
		} catch (RemoteException e) {
		throw new RuntimeException(
		"ActivityView: Unable to set surface of ActivityContainer. " + e);
		}
		}
		}
		};
		mTextureView = new TextureView(context);
		mTextureView.setSurfaceTextureListener(new ActivityViewSurfaceTextureListener());
		addView(mTextureView);

		WindowManager wm = (WindowManager)mActivity.getSystemService(Context.WINDOW_SERVICE);
		wm.getDefaultDisplay().getMetrics(mMetrics);
		DisplayMetrics metrics = new DisplayMetrics();
		wm.getDefaultDisplay().getMetrics(metrics);
		mDensityDpi = metrics.densityDpi;

		mLastVisibility = getVisibility();

		@@ -131,15 +179,13 @@ public class ActivityView extends ViewGroup {
		}

		@Override
		protected void onVisibilityChanged(View changedView, int visibility) {
		protected void onVisibilityChanged(View changedView, final int visibility) {
		super.onVisibilityChanged(changedView, visibility);

		if (mSurface != null && (visibility == View.GONE \|\| mLastVisibility == View.GONE)) {
		Message msg = Message.obtain(mHandler, MSG_SET_SURFACE);
		msg.obj = (visibility == View.GONE) ? null : mSurface;
		msg.arg1 = mWidth;
		msg.arg2 = mHeight;
		mHandler.sendMessage(msg);
		if (DEBUG) Log.v(TAG, "visibility changed; enqueing runnable");
		final Surface surface = (visibility == View.GONE) ? null : mSurface;
		setSurfaceAsync(surface, mWidth, mHeight, mDensityDpi, false);
		}
		mLastVisibility = visibility;
		}
		@@ -230,8 +276,10 @@ public class ActivityView extends ViewGroup {
		Log.e(TAG, "Duplicate call to release");
		return;
		}
		synchronized (mActivityContainerLock) {
		mActivityContainer.release();
		mActivityContainer = null;
		}

		if (mSurface != null) {
		mSurface.release();
		@@ -241,22 +289,38 @@ public class ActivityView extends ViewGroup {
		mTextureView.setSurfaceTextureListener(null);
		}

		private void attachToSurfaceWhenReady() {
		final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
		if (surfaceTexture == null \|\| mSurface != null) {
		// Either not ready to attach, or already attached.
		return;
		}

		mSurface = new Surface(surfaceTexture);
		private void setSurfaceAsync(final Surface surface, final int width, final int height,
		final int densityDpi, final boolean callback) {
		mExecutor.execute(new Runnable() {
		public void run() {
		try {
		mActivityContainer.setSurface(mSurface, mWidth, mHeight, mMetrics.densityDpi);
		synchronized (mActivityContainerLock) {
		if (mActivityContainer != null) {
		mActivityContainer.setSurface(surface, width, height, densityDpi);
		}
		}
		} catch (RemoteException e) {
		mSurface.release();
		mSurface = null;
		throw new RuntimeException("ActivityView: Unable to create ActivityContainer. " + e);
		throw new RuntimeException(
		"ActivityView: Unable to set surface of ActivityContainer. ",
		e);
		}
		if (callback) {
		post(new Runnable() {
		@Override
		public void run() {
		if (mActivityViewCallback != null) {
		if (surface != null) {
		mActivityViewCallback.onSurfaceAvailable(ActivityView.this);
		} else {
		mActivityViewCallback.onSurfaceDestroyed(ActivityView.this);
		}
		}
		}
		});
		}
		}
		});
		}

		/**
		* Set the callback to use to report certain state changes.
		@@ -306,10 +370,8 @@ public class ActivityView extends ViewGroup {
		+ height);
		mWidth = width;
		mHeight = height;
		attachToSurfaceWhenReady();
		if (mActivityViewCallback != null) {
		mActivityViewCallback.onSurfaceAvailable(ActivityView.this);
		}
		mSurface = new Surface(surfaceTexture);
		setSurfaceAsync(mSurface, mWidth, mHeight, mDensityDpi, true);
		}

		@Override
		@@ -329,15 +391,7 @@ public class ActivityView extends ViewGroup {
		if (DEBUG) Log.d(TAG, "onSurfaceTextureDestroyed");
		mSurface.release();
		mSurface = null;
		try {
		mActivityContainer.setSurface(null, mWidth, mHeight, mMetrics.densityDpi);
		} catch (RemoteException e) {
		throw new RuntimeException(
		"ActivityView: Unable to set surface of ActivityContainer. " + e);
		}
		if (mActivityViewCallback != null) {
		mActivityViewCallback.onSurfaceDestroyed(ActivityView.this);
		}
		setSurfaceAsync(null, mWidth, mHeight, mDensityDpi, true);
		return true;
		}

core/java/android/app/Notification.java

+22 −6

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.os.UserHandle;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.SparseArray;
		import android.util.TypedValue;
		import android.view.Gravity;
		import android.view.View;
		@@ -62,6 +63,8 @@ import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.Set;

		/**
		* A class that represents how a persistent notification is to be presented to
		@@ -960,6 +963,9 @@ public class Notification implements Parcelable
		private Action(Icon icon, CharSequence title, PendingIntent intent, Bundle extras,
		RemoteInput[] remoteInputs) {
		this.mIcon = icon;
		if (icon != null && icon.getType() == Icon.TYPE_RESOURCE) {
		this.icon = icon.getResId();
		}
		this.title = title;
		this.actionIntent = intent;
		this.mExtras = extras != null ? extras : new Bundle();
		@@ -1607,13 +1613,23 @@ public class Notification implements Parcelable
		bigContentView = null;
		headsUpContentView = null;
		mLargeIcon = null;
		if (extras != null) {
		extras.remove(Notification.EXTRA_LARGE_ICON);
		extras.remove(Notification.EXTRA_LARGE_ICON_BIG);
		extras.remove(Notification.EXTRA_PICTURE);
		extras.remove(Notification.EXTRA_BIG_TEXT);
		if (extras != null && !extras.isEmpty()) {
		// Prevent light notifications from being rebuilt.
		extras.remove(Builder.EXTRA_NEEDS_REBUILD);
		final Set<String> keyset = extras.keySet();
		final int N = keyset.size();
		final String[] keys = keyset.toArray(new String[N]);
		for (int i=0; i<N; i++) {
		final String key = keys[i];
		final Object obj = extras.get(key);
		if (obj != null &&
		( obj instanceof Parcelable
		\|\| obj instanceof Parcelable[]
		\|\| obj instanceof SparseArray
		\|\| obj instanceof ArrayList)) {
		extras.remove(key);
		}
		}
		}
		}

		@@ -4619,7 +4635,7 @@ public class Notification implements Parcelable
		* Size value for use with {@link #setCustomSizePreset} to show this notification with
		* default sizing.
		* <p>For custom display notifications created using {@link #setDisplayIntent},
		* the default is {@link #SIZE_LARGE}. All other notifications size automatically based
		* the default is {@link #SIZE_MEDIUM}. All other notifications size automatically based
		* on their content.
		*/
		public static final int SIZE_DEFAULT = 0;