summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make UNSPECIFIED measure spec include size hint.Filip Gruszczynski2015-04-1612-34/+52
| | | | Change-Id: I6c4f193d0590824c644e20e8af16d055a04ac9c9
* Update GpsLocationProvider construction sequence to save time on startup.destradaa2015-04-161-70/+90
| | | | | | | | | | b/20127262 This change moves long running operations: such as IO and broadcast receivers registration to its internal handler. This sets the time to execute GpsLocationProvider ctor() to ~14ms. A significant improvement from the 285ms reported originally in the bug. Change-Id: I4ee4183a1afea86117004c0a052957b8bc1e4ce5
* Add keys for visual voicemail carrier configuration valuesNancy Chen2015-04-162-0/+40
| | | | | | | | Each carrier has its own set of visual voicemail configuration values to be retrieved from the carrier config manager API. Bug:19236241 Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
* Merge "Fix various conformance issues with TextDirectionHeuristics."Roozbeh Pournader2015-04-161-40/+80
|\
| * Fix various conformance issues with TextDirectionHeuristics.Roozbeh Pournader2015-04-151-40/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The algorithms no longer consider directional embeddings and overrides as strong characters. 2. The algorithms are updated to Unicode 7.0, and consider the directional isolates in determining the direction of input. 3. Codepoints are used instead of code units for looking up bidi properties. 4. The bidi direction of unassigned characters is considered. Bug: 20142480 Change-Id: I9be161c112b8f23565ed8961bb7d44ced234f67a
* | am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster ↵Alex Klyubin2015-04-162-3/+13
|\ \ | | | | | | | | | | | | | | | | | | KM_ORIGIN_UNKNOWN constant." * commit 'b1aa7d0bc821614d943075c0d786cc3f5eeb8c73': Add Keymaster KM_ORIGIN_UNKNOWN constant.
| * \ am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
| |\ \ | | | | | | | | | | | | | | | | * commit '51884f0e066bcf1ba5e039cd8a24a87139b5a01c': Add Keymaster KM_ORIGIN_UNKNOWN constant.
| | * \ am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '499126c43385ba7bce9b8547b61bafd0c6311147': Add Keymaster KM_ORIGIN_UNKNOWN constant.
| | | * \ Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
| | | |\ \
| | | | * | Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-142-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks d359b044830b292f492f8a8df5471f869e358399 from hardware/libhardware. Bug: 18088752 Change-Id: I9a7bd8bdee51c18ae0427eff4efe036213d2b175
* | | | | | Merge "Lower protection level of access mock location permission"Svetoslav2015-04-161-13/+6
|\ \ \ \ \ \
| * | | | | | Lower protection level of access mock location permissionSvetoslav2015-04-141-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ACCESS_MOCK_LOCATION permission is gated by a secure setting toggled in developer options by the user. Hence, there is no need for getting yet another consent from the user for accessing it. Change-Id: Ica1a72f587a712d7da7c00cfc4a8ca228064286e
* | | | | | | Merge "Unhide BLAS intrinsics."Tim Murray2015-04-163-2/+112
|\ \ \ \ \ \ \
| * | | | | | | Unhide BLAS intrinsics.Tim Murray2015-04-163-2/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3006d878e68cce833d8f26cb5d8a1a660a6f5565
* | | | | | | | Merge "Adding Carrier Config API."Junda Liu2015-04-1613-4/+695
|\ \ \ \ \ \ \ \
| * | | | | | | | Adding Carrier Config API.Jonathan Basseri2015-04-1613-4/+695
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UICC privileged carrier apps will extend CarrierConfigService to provide carrier-specific configuration. Apps/services will use CarrierConfigManager to read the current configuration. CarrierConfigManager also defines the set of configuration variables and their default values. Bug: b/19483786 Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
* | | | | | | | Merge "Dump something for AppIdleController"Amith Yamasani2015-04-161-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Dump something for AppIdleControllerAmith Yamasani2015-04-151-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b17b23b6e0e7c10933b154209f680e4723955eb
* | | | | | | | | Merge "Colored button should be using inverse primary text color"Alan Viverette2015-04-165-1/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Colored button should be using inverse primary text colorAlan Viverette2015-04-155-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20227868 Change-Id: I4c3ea4cd5b1dc36014dfff4ae63b085e2268a4fa
* | | | | | | | | | Merge "Fixed the behavior for HUNs with fullscreen intents"Selim Cinek2015-04-162-6/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed the behavior for HUNs with fullscreen intentsSelim Cinek2015-04-162-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now HUNs with full screen intents don't fire automatically when added and don't time out anymore when HUN'd Change-Id: Ic2d5033febe514760cbb4e6e028c3cea84d07cd8
* | | | | | | | | | | Merge "Fixed that disappear animations were disabled"Selim Cinek2015-04-161-15/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fixed that disappear animations were disabledSelim Cinek2015-04-161-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20165559 Change-Id: I44fd10aee1ad4107ffcf98e103cd8054afb83731
* | | | | | | | | | | Merge "Fixed a bug where the notification size was incorrect"Selim Cinek2015-04-161-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fixed a bug where the notification size was incorrectSelim Cinek2015-04-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an activity was shown and the device was locked the notification had the wrong size if they were redacted. Bug: 20086154 Change-Id: I37448a2ba1c027cffd1f945b031d08f0fd90f638
* | | | | | | | | | | Merge changes I847ec3a9,I201b5206Pierre Vandwalle2015-04-163-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: add HAL PNO config parameter add disconnected scan parameter, add bytes[] container to scanResults
| * | | | | | | | | | | add HAL PNO config parameterPierre Vandwalle2015-04-162-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I847ec3a9cbd9f0036a4de7b88667f26f7880d7b1
| * | | | | | | | | | | add disconnected scan parameter, add bytes[] container to scanResultsPierre Vandwalle2015-04-163-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
* | | | | | | | | | | | Merge "resolved conflicts for merge of 186fe7b1 to master"Deepanshu Gupta2015-04-1617-163/+223
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 186fe7b1 to masterDeepanshu Gupta2015-04-1617-163/+223
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60886d3e44ae23a11c8f129517df87ee29625ada
| | * | | | | | | | | | | am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic ↵Deepanshu Gupta2015-04-1618-164/+224
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'layoutlib-api-15\' into lmp-mr1-dev * commit 'c4affce9df0817b84df3e61c3932f53b77ee0986': Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
| | | * | | | | | | | | | am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic ↵Deepanshu Gupta2015-04-1618-164/+224
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'layoutlib-api-15\' into lmp-mr1-dev * commit '1f3c7f3f500bdbfd790c20872961d84ef617f066': Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
| | | | * \ \ \ \ \ \ \ \ \ am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into ↵Deepanshu Gupta2015-04-1618-164/+224
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b': Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
| | | | | * \ \ \ \ \ \ \ \ \ am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-devDeepanshu Gupta2015-04-1618-164/+224
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8': Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
| | | | | | * \ \ \ \ \ \ \ \ \ Merge changes from topic 'layoutlib-api-15' into lmp-mr1-devDeepanshu Gupta2015-04-1618-164/+224
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
| | | | | | | * | | | | | | | | | Update golden image for tests.Deepanshu Gupta2015-04-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
| | | | | | | * | | | | | | | | | Update to using LayoutlibCallback.Deepanshu Gupta2015-04-1517-154/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
| | | | | | | * | | | | | | | | | Remove implementation of deprecated method.Deepanshu Gupta2015-04-152-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BridgeResources.getDrawable(int) is not needed anymore, since the super method is deprecated and it calls the alternative getDrawable(int, Theme), which we override. Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
| | | | | | | * | | | | | | | | | Add @empty support.Deepanshu Gupta2015-04-151-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/162428 Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
* | | | | | | | | | | | | | | | | Merge "An update on VolumePanel."John Spurlock2015-04-1638-2242/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | An update on VolumePanel.John Spurlock2015-04-1638-2242/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retired, and removed all claimed resources. VolumeDialog is now the only option. Bug: 19260237 Change-Id: I6e8abff0f8c16c4e02c47c8b7f24d5703cb3dbdf
* | | | | | | | | | | | | | | | Merge "Unhide Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-163-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Unhide Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-143-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export runtime stats (currently GC stats) through this method. Bug: 19825248 Change-Id: I8f859a2bc497e604f4c4f23f6b45b49ac4f99790
* | | | | | | | | | | | | | | | | Merge "Move Phone.java APIs into InCallService"Santos Cordon2015-04-163-5/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move Phone.java APIs into InCallServiceSantos Cordon2015-04-163-5/+173
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is one step in the right direction of getting rid of Phone.java. Phone.java was deemed superfluous and this change moves the methods previously exposed in Phone.java into InCallService. This was done by having InCallService listen to Phone and pipe the calls as appropriate. However, state still lives in Phone and we eventually want to move that code into InCallService. That will be done in a later CL. Bug: 20160495 Change-Id: Id142431c253c1f24f260da42e8bedd1eb2ce448b
* | | | | | | | | | | | | | | | am 81d0aabc: am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81d0aabcb5af11f8695793dbfac893d17688970e': Document hprof-conv -z
| * | | | | | | | | | | | | | | am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40955edf9dc1e90b337af89543919eec4868dbe0': Document hprof-conv -z
| | * | | | | | | | | | | | | | am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '14a982aa7a38fa89c916c252996632d401b1d043': Document hprof-conv -z
| | | * | | | | | | | | | | | | Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \