Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 034d65d6 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.3' into HEAD 

Conflicts:
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

Change-Id: I28be3df4ba15ae828eb3347f25715784df0ef875
parents 1cb2597f a7d293c9

Android.mk

+21 −6
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IActivityPendingResult.aidl \

	core/java/android/app/IAlarmManager.aidl \

	core/java/android/app/IAppTask.aidl \

	core/java/android/app/ITaskStackListener.aidl \

	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/INotificationManager.aidl \
@@ -104,6 +105,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothAvrcpController.aidl \

	core/java/android/bluetooth/IBluetoothCallback.aidl \

	core/java/android/bluetooth/IQBluetoothAdapterCallback.aidl \

	core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

	core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \

	core/java/android/bluetooth/IBluetoothHealth.aidl \
@@ -184,6 +186,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/usb/IUsbManager.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \

	core/java/android/net/INetworkManagementEventObserver.aidl \

	core/java/android/net/INetworkPolicyListener.aidl \

	core/java/android/net/INetworkPolicyManager.aidl \
@@ -212,6 +215,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IUpdateLock.aidl \

	core/java/android/os/IUserManager.aidl \

	core/java/android/os/IVibratorService.aidl \

	core/java/android/service/carrier/ICarrierMessagingCallback.aidl \

	core/java/android/service/carrier/ICarrierMessagingService.aidl \

	core/java/android/service/notification/INotificationListener.aidl \

	core/java/android/service/notification/IStatusBarNotificationHolder.aidl \

	core/java/android/service/notification/IConditionListener.aidl \
@@ -281,6 +286,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/policy/IKeyguardShowCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardService.aidl \

	core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \

	core/java/com/android/internal/os/IParcelFileDescriptorFactory.aidl \

	core/java/com/android/internal/os/IResultReceiver.aidl \
@@ -299,7 +305,6 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputSessionCallback.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/ILockSettingsObserver.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \

	keystore/java/android/security/IKeyChainAliasCallback.aidl \
@@ -338,6 +343,7 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IRemoteVolumeObserver.aidl \

	media/java/android/media/IRingtonePlayer.aidl \

	media/java/android/media/IVolumeController.aidl \

        media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \

	media/java/android/media/projection/IMediaProjection.aidl \

	media/java/android/media/projection/IMediaProjectionCallback.aidl \

	media/java/android/media/projection/IMediaProjectionManager.aidl \
@@ -384,6 +390,7 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	telephony/java/com/android/internal/telephony/ITelephony.aidl \

	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \

	telephony/java/com/android/internal/telephony/ISms.aidl \

	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \

	telephony/java/com/android/internal/telephony/ISub.aidl \
@@ -413,9 +420,6 @@ LOCAL_DX_FLAGS := --core-library --multi-dex 


LOCAL_RMTYPEDEFS := true



# List of classes and interfaces which should be loaded by the Zygote.

LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes



include $(BUILD_JAVA_LIBRARY)

framework_module := $(LOCAL_INSTALLED_MODULE)
@@ -447,6 +451,7 @@ aidl_files := \ 
	frameworks/base/media/java/android/media/MediaDescription.aidl \

	frameworks/base/media/java/android/media/Rating.aidl \

	frameworks/base/media/java/android/media/AudioAttributes.aidl \

	frameworks/base/media/java/android/media/AudioFocusInfo.aidl \

	frameworks/base/media/java/android/media/session/PlaybackState.aidl \

	frameworks/base/media/java/android/media/session/MediaSession.aidl \

	frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \
@@ -535,6 +540,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \

	frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \

	frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \

	frameworks/base/core/java/android/speech/tts/Voice.aidl \

	frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
@@ -575,6 +581,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/content/pm/ProviderInfo.aidl \

	frameworks/base/core/java/android/content/pm/PackageStats.aidl \

	frameworks/base/core/java/android/content/pm/PermissionGroupInfo.aidl \

	frameworks/base/core/java/android/content/pm/LabeledIntent.aidl \

	frameworks/base/core/java/android/content/ComponentName.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/ContentValues.aidl \
@@ -744,17 +751,20 @@ samples_dir := development/samples/browseable 
# Whitelist of valid groups, used for default TOC grouping. Each sample must

# belong to one (and only one) group. Assign samples to groups by setting

# a sample.group var to one of these groups in the sample's _index.jd.

sample_groups := -samplegroup Background \

sample_groups := -samplegroup Admin \

                 -samplegroup Background \

                 -samplegroup Connectivity \

                 -samplegroup Content \

                 -samplegroup Input \

                 -samplegroup Media \

                 -samplegroup Notification \

                 -samplegroup RenderScript \

                 -samplegroup Security \

                 -samplegroup Sensors \

                 -samplegroup Testing \

                 -samplegroup UI \

                 -samplegroup Views

                 -samplegroup Views \

                 -samplegroup Wearable



## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)
@@ -827,6 +837,11 @@ LOCAL_UNINSTALLABLE_MODULE := true 


include $(BUILD_DROIDDOC)



# $(gen), i.e. framework.aidl, is also needed while building against the current stub.

$(full_target): $(framework_built) $(gen)

$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))



# ====  check javadoc comments but don't generate docs ========

include $(CLEAR_VARS)

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/servic 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/inputflinger $(PRODUCT_OUT)/symbols/system/bin/inputflinger)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/RsFountainFbo_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecomm)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/widget/ILockSettingsObserver.java)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

api/current.txt

+1156 −946

File changed.

Preview size limit exceeded, changes collapsed.

api/removed.txt

+20 −0
Original line number Diff line number Diff line
@@ -22,6 +22,26 @@ package android.os { 


}



package android.text.format {



  public class DateFormat {

    field public static final deprecated char AM_PM = 97; // 0x0061 'a'

    field public static final deprecated char CAPITAL_AM_PM = 65; // 0x0041 'A'

    field public static final deprecated char DATE = 100; // 0x0064 'd'

    field public static final deprecated char DAY = 69; // 0x0045 'E'

    field public static final deprecated char HOUR = 104; // 0x0068 'h'

    field public static final deprecated char HOUR_OF_DAY = 107; // 0x006b 'k'

    field public static final deprecated char MINUTE = 109; // 0x006d 'm'

    field public static final deprecated char MONTH = 77; // 0x004d 'M'

    field public static final deprecated char QUOTE = 39; // 0x0027 '\''

    field public static final deprecated char SECONDS = 115; // 0x0073 's'

    field public static final deprecated char STANDALONE_MONTH = 76; // 0x004c 'L'

    field public static final deprecated char TIME_ZONE = 122; // 0x007a 'z'

    field public static final deprecated char YEAR = 121; // 0x0079 'y'

  }



}



package android.view {



  public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

api/system-current.txt

0 → 100644
+61392 −0

File added.

Preview size limit exceeded, changes collapsed.