summaryrefslogtreecommitdiffstats
path: root/native
Commit message (Collapse)AuthorAgeFilesLines
* Udpate instrumentation codeWilliam Clark2015-11-302-3/+0
| | | | | | Added changes to support new features in QSSP Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Call getInstanceForPackage instead of creating a new SensorManager instance.Aravind Akella2015-07-301-5/+1
| | | | | | | | | | Bug: 22529981 Change-Id: If077e042a4af940dfb1fc9c4ac8b9d352dd32685
* | SEEMP: Add more framework instrumentationWilliam Clark2015-10-062-1/+4
|/ | | | | | | | | Instrument framework files to log events of interest. Conflicts: core/java/android/accounts/AccountManager.java Change-Id: Ia45651e6352586f910039b51cac2356f65f80010
* Revert "Call getInstanceForPackage instead of creating a new SensorManager ↵Narayan Kamath2015-07-291-1/+4
| | | | | | | | instance." This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637. Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
* Call getInstanceForPackage instead of creating a new SensorManager instance.Aravind Akella2015-07-271-4/+1
| | | | | Bug: 22529981 Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086
* Add native tracing APIChris Craik2015-06-102-0/+31
| | | | | | bug:21195272 Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
* Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-151-0/+9
| | | | | | | | The round qualifier denotes a device with a screen shape that is round. The qualifier shows up after the 'long/notlong' qualifier and before the orientation 'port/land/square' qualifiers. Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
* Switch libjnigraphics.so to hash-style=bothDmitriy Ivanov2015-05-081-1/+1
| | | | | | Bug: http://b/19059885 Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc (cherry picked from commit 2e84bc6948bb24ec67bf289ee1d0ed937a0fd4ff)
* Fix broke NDK sensor manager APISvet Ganov2015-05-071-0/+18
| | | | Change-Id: I0f4e2a3ce20ce20e0aa5a7d38d1f988497c033c0
* Add warning if an in-use Bitmap is reconfiguredJohn Reck2015-05-061-3/+9
| | | | | | | | | Bug: 18928352 Also fix an issue around re-configure not properly handling mPinnedCount in android::Bitmap Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
* Add body sensors app op - framework baseSvet Ganov2015-05-011-5/+0
| | | | Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
* Change how Java Bitmaps are accessed in a few placesJohn Reck2015-04-301-17/+18
| | | | | | | | | | | | | Stop assuming that a Java Bitmap has a SkBitmap* that has some externally managed lifecycle, and instead switch a bunch of users to accessing the bitmap by providing their own SkBitmap* on which to set the (ref counted!) SkPixelRef* instead Attempt #2 to land this, original issue was in getSkBitmap and should be fixed Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
* GraphicsJNI Canvas cleanupJohn Reck2015-04-221-1/+2
| | | | Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
* Merge "Revert "Change how Java Bitmaps are accessed in a few places""John Reck2015-04-201-18/+17
|\
| * Revert "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-201-18/+17
| | | | | | | | | | | | | | | | Bug: 20207616 This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0. Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
* | Revert "A bunch more cleanups"John Reck2015-04-171-2/+1
| | | | | | | | | | | | This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
* | Merge "A bunch more cleanups"John Reck2015-04-151-1/+2
|\ \
| * | A bunch more cleanupsJohn Reck2015-04-141-1/+2
| |/ | | | | | | | | | | | | | | Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
* | multinetwork API: native implementationErik Kline2015-04-152-3/+92
|/ | | | | Bug: 19537384 Change-Id: I04f4a7de2b1e583989b67a853df6ab50289c2185
* Change how Java Bitmaps are accessed in a few placesJohn Reck2015-04-131-17/+18
| | | | | | | | | | Stop assuming that a Java Bitmap has a SkBitmap* that has some externally managed lifecycle, and instead switch a bunch of users to accessing the bitmap by providing their own SkBitmap* on which to set the (ref counted!) SkPixelRef* instead Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
* am 1c8b3778: am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"Dmitriy Ivanov2015-03-131-1/+1
|\ | | | | | | | | * commit '1c8b3778e1c380992a9ca96e965cdc4e6f3bca66': Switch libjnigraphics to sysv-only hash style
| * Switch libjnigraphics to sysv-only hash styleDmitriy Ivanov2015-03-131-1/+1
| | | | | | | | | | Bug: 19059885 Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
* | am 3b9cfe30: am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-111-1/+1
|\ \ | |/ | | | | | | * commit '3b9cfe30ed4ae34d06a8f005c8ada593c314316b': Generate gnu hash for arm only
| * Generate gnu hash for arm onlyGoran Jakovljevic2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes build failure caused by: https://android-review.googlesource.com/#/c/139670/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I8edb8a1595308db2ecd1bd6650a069b1224ae64f
* | am 1944667b: am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for ↵Dmitriy Ivanov2015-03-111-0/+3
|\ \ | |/ | | | | | | | | | | libjnigraphics" * commit '1944667b7f70c336da66cc3fbdee3a2fbd766980': Generate sysv hash for libjnigraphics
| * Generate sysv hash for libjnigraphicsDmitriy Ivanov2015-03-091-0/+3
| | | | | | | | | | Bug: 19059885 Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
* | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-3/+3
| | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-3/+3
| | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | Cleanup Bitmap JNIJohn Reck2015-03-051-3/+3
|/ | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* Merge "Frameworks/base: Wall Werror in native/graphics"Andreas Gampe2014-11-112-5/+11
|\
| * Frameworks/base: Wall Werror in native/graphicsAndreas Gampe2014-11-102-5/+11
| | | | | | | | | | | | Turn on -Wall -Werror in native/graphics. Mask skia warnings. Change-Id: Ia671e91348296ace84d9a24b3c6c025fa889bead
* | Frameworks/base: Wall Werror in native/androidAndreas Gampe2014-11-101-1/+3
|/ | | | | | Turn on -Wall -Werror in native/android. Change-Id: I28bab9ebd2fe3f6935878816773a04531e26450f
* Sensor related changes for NDK.Aravind Akella2014-08-051-0/+18
| | | | | | | | i) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx methods. Bug: 16399898 Change-Id: Icc252aad068fa337bef8b22f20584f98cd5a155d
* SkBitmap::Config is deprecated, use SkColorTypeMike Reed2014-07-081-5/+5
| | | | Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
* Add java APIs for Sensor reportingMode.Aravind Akella2014-06-091-0/+5
| | | | Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
* am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." ↵Aravind Akella2014-05-231-5/+0
|\ | | | | | | | | | | | | into klp-modular-dev * commit 'c7153377cf03303e97185397544a13971a089961': Remove getRequiredPermission from NDK.
| * am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-devAravind Akella2014-05-221-5/+0
| |\ | | | | | | | | | | | | * commit '73da981fd60f9dc855a04ea53e9fff59a011577e': Remove getRequiredPermission from NDK.
| | * Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-5/+0
| | | | | | | | | | | | Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
* | | Bug fix for wakeup sensors.Aravind Akella2014-04-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now. Bug: 9774884 Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e
* | | am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to ↵Aravind Akella2014-04-111-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev * commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| * | am cd4c1c71: Merge "Add stringType and requiredPermissions to ↵Aravind Akella2014-04-111-0/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev * commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| | * Add stringType and requiredPermissions to SensorManager.java, as well as a ↵Aravind Akella2014-04-111-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | permission for the heart rate sensor This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1. Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
| * | am 819239e5: Revert "Add stringType and requiredPermissions to ↵Etienne Le Grand2014-04-051-20/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" * commit '819239e5bec90ee3c861ac45fffac4a832a183a1': Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
| | * Revert "Add stringType and requiredPermissions to SensorManager.java, as ↵Etienne Le Grand2014-04-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | well as a permission for the heart rate sensor" This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3. Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
* | | Revert "Add stringType and requiredPermissions to SensorManager.java, as ↵Etienne Le Grand2014-04-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | well as a permission for the heart rate sensor" This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3. Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61 (cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
* | | am bdfe3841: am fd53d835: Add stringType and requiredPermissions to ↵Etienne Le Grand2014-04-051-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor * commit 'bdfe384106de364ea2effac6ab80108556d11649': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| * | am fd53d835: Add stringType and requiredPermissions to SensorManager.java, ↵Etienne Le Grand2014-04-051-0/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | as well as a permission for the heart rate sensor * commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| | * Add stringType and requiredPermissions to SensorManager.java, as well as a ↵Etienne Le Grand2014-04-041-0/+20
| | | | | | | | | | | | | | | | | | permission for the heart rate sensor Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
* | | Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | | The libskia target exports all of its public includes directories so redefining them here is redundant. Also this cleans up and makes it obvious where the framework is making using of private Skia headers. Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
generated by cgit v1.1 at 2024-04-29 12:53:32 +0000