summaryrefslogtreecommitdiffstats
path: root/services/core/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* fw: Move proximitycheck to CMSettings.Adnan Begovic2015-11-091-1/+1
| | | | Change-Id: Ie80166c990363d3846925b189a1f7001a7fd56f8
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * ConnectivityManager API for for packet keepalives.Lorenzo Colitti2015-07-181-1/+1
| | | | | | | | | | Bug: 21405946 Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
* | livedisplay: Implement active display adjustmentSteve Kondik2015-10-181-0/+4
|/ | | | | | | | | | | | | | | | | | | | * LiveDisplay is our new name for the various display technologies which adjust the screen based on environmental conditions other than the standard automatic backlight controls. * This patch implements automatic color temperature adjustment based on time of day. This is similar to f.lux or Redshift. My eyes are so happy now! * Automatic outdoor/SRE feature is now handled here. * Handling of CABC/CABL and color enhancements also handled here. * Manual RGB tweaking is handled here. * Can delegate to DisplayColor HAL if available, otherwise uses SurfaceFlinger's 1015 operation to apply changes. * Happily coexists with the new accessibility features for color blindness correction and color inversion. * All postprocessing will be disabled when powersave mode is activated. Change-Id: Iac1b74f410957f8e2d8290465c4ce9cc1fd97a88
* resolved conflicts for merge of 962a11ad to masterNeil Fuller2015-03-311-0/+1
|\ | | | | | | Change-Id: I8c6ac62d7267629c019997bb343d863aa56264eb
| * An updater for all timezone data on a deviceNeil Fuller2015-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The existing one, being deleted here, did not work properly: it only updated the file used by libcore and bionic, it did not update the ICU data. Most of the installation logic exists in code in libcore/tzdata that is independent of the server code so that it can be tested. Bug: 19941636 Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
* | Split up android.policy into framework.jar and services.jar 1/3Jorim Jaggi2015-02-101-1/+1
|/ | | | Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
* Check feature bits before loading optional servicesAdam Lesinski2014-02-051-0/+14
At startup, we check with PackageManager whether a system service is available before attempting to load it. A system service is available if its associated feature (similar to hardware features) is present. This does not remove unavailable services from the compiled jar. Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7