Skip to content

Commit c05531f

Browse files
gmillzgmillz
committed
Merge tag 'android-6.0.1_r22' into HEAD
Android 6.0.1 release 22 Change-Id: I87262f7f7ebdbbe4664242645fa4ff6bd0f5753b
2 parents 73002c4 + e342181 commit c05531f

938 files changed

Lines changed: 12587 additions & 14181 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/current.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45134,7 +45134,10 @@ package java.lang.reflect {
4513445134
}
4513545135

4513645136
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
45137+
method public boolean equals(java.lang.Object);
4513745138
method public A getAnnotation(java.lang.Class<A>);
45139+
method public java.lang.annotation.Annotation[] getAnnotations();
45140+
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
4513845141
method public java.lang.Class<T> getDeclaringClass();
4513945142
method public java.lang.Class<?>[] getExceptionTypes();
4514045143
method public java.lang.reflect.Type[] getGenericExceptionTypes();
@@ -45144,6 +45147,7 @@ package java.lang.reflect {
4514445147
method public java.lang.annotation.Annotation[][] getParameterAnnotations();
4514545148
method public java.lang.Class<?>[] getParameterTypes();
4514645149
method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
45150+
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
4514745151
method public boolean isSynthetic();
4514845152
method public boolean isVarArgs();
4514945153
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 {
4521745221
}
4521845222

4521945223
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
45224+
method public boolean equals(java.lang.Object);
4522045225
method public A getAnnotation(java.lang.Class<A>);
45226+
method public java.lang.annotation.Annotation[] getAnnotations();
45227+
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
4522145228
method public java.lang.Class<?> getDeclaringClass();
4522245229
method public java.lang.Object getDefaultValue();
4522345230
method public java.lang.Class<?>[] getExceptionTypes();
@@ -45231,6 +45238,7 @@ package java.lang.reflect {
4523145238
method public java.lang.Class<?> getReturnType();
4523245239
method public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
4523345240
method public java.lang.Object invoke(java.lang.Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
45241+
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
4523445242
method public boolean isBridge();
4523545243
method public boolean isSynthetic();
4523645244
method public boolean isVarArgs();

‎api/system-current.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ package android {
130130
field public static final java.lang.String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS";
131131
field public static final java.lang.String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";
132132
field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
133+
field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS";
133134
field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";
134135
field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";
135136
field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
@@ -32713,19 +32714,25 @@ package android.telecom {
3271332714
field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
3271432715
field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
3271532716
field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";
32717+
field public static final java.lang.String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED";
3271632718
field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
3271732719
field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
32720+
field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION";
3271832721
field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
3271932722
field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
3272032723
field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
32724+
field public static final java.lang.String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";
3272132725
field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
3272232726
field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
3272332727
field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
3272432728
field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
3272532729
field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
32730+
field public static final java.lang.String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";
3272632731
field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
3272732732
field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
3272832733
field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
32734+
field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";
32735+
field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";
3272932736
field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
3273032737
field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
3273132738
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 {
3342533432
field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
3342633433
field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
3342733434
field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
33435+
field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
3342833436
field public static final int CALL_STATE_IDLE = 0; // 0x0
3342933437
field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
3343033438
field public static final int CALL_STATE_RINGING = 1; // 0x1
@@ -33441,11 +33449,15 @@ package android.telephony {
3344133449
field public static final int DATA_CONNECTING = 1; // 0x1
3344233450
field public static final int DATA_DISCONNECTED = 0; // 0x0
3344333451
field public static final int DATA_SUSPENDED = 3; // 0x3
33452+
field public static final java.lang.String EXTRA_CALL_VOICEMAIL_INTENT = "android.telephony.extra.CALL_VOICEMAIL_INTENT";
3344433453
field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
33454+
field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
33455+
field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
3344533456
field public static final java.lang.String EXTRA_STATE = "state";
3344633457
field public static final java.lang.String EXTRA_STATE_IDLE;
3344733458
field public static final java.lang.String EXTRA_STATE_OFFHOOK;
3344833459
field public static final java.lang.String EXTRA_STATE_RINGING;
33460+
field public static final java.lang.String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";
3344933461
field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
3345033462
field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
3345133463
field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
@@ -47740,7 +47752,10 @@ package java.lang.reflect {
4774047752
}
4774147753

4774247754
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
47755+
method public boolean equals(java.lang.Object);
4774347756
method public A getAnnotation(java.lang.Class<A>);
47757+
method public java.lang.annotation.Annotation[] getAnnotations();
47758+
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
4774447759
method public java.lang.Class<T> getDeclaringClass();
4774547760
method public java.lang.Class<?>[] getExceptionTypes();
4774647761
method public java.lang.reflect.Type[] getGenericExceptionTypes();
@@ -47750,6 +47765,7 @@ package java.lang.reflect {
4775047765
method public java.lang.annotation.Annotation[][] getParameterAnnotations();
4775147766
method public java.lang.Class<?>[] getParameterTypes();
4775247767
method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
47768+
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
4775347769
method public boolean isSynthetic();
4775447770
method public boolean isVarArgs();
4775547771
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 {
4782347839
}
4782447840

4782547841
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
47842+
method public boolean equals(java.lang.Object);
4782647843
method public A getAnnotation(java.lang.Class<A>);
47844+
method public java.lang.annotation.Annotation[] getAnnotations();
47845+
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
4782747846
method public java.lang.Class<?> getDeclaringClass();
4782847847
method public java.lang.Object getDefaultValue();
4782947848
method public java.lang.Class<?>[] getExceptionTypes();
@@ -47837,6 +47856,7 @@ package java.lang.reflect {
4783747856
method public java.lang.Class<?> getReturnType();
4783847857
method public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
4783947858
method public java.lang.Object invoke(java.lang.Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
47859+
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
4784047860
method public boolean isBridge();
4784147861
method public boolean isSynthetic();
4784247862
method public boolean isVarArgs();

‎core/java/android/app/ActivityThread.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,6 +4235,11 @@ final void handleConfigurationChanged(Configuration config, CompatibilityInfo co
42354235

42364236
configDiff = mConfiguration.updateFrom(config);
42374237
config = applyCompatConfiguration(mCurDefaultDisplayDpi);
4238+
4239+
final Theme systemTheme = getSystemContext().getTheme();
4240+
if ((systemTheme.getChangingConfigurations() & configDiff) != 0) {
4241+
systemTheme.rebase();
4242+
}
42384243
}
42394244

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

0 commit comments

Comments
 (0)