Svetoslav
8fcd5fee60
Merge "Lower protection level of access mock location permission"
2015-04-16 20:19:46 +00:00
Tim Murray
33d930ad96
Merge "Unhide BLAS intrinsics."
2015-04-16 20:13:53 +00:00
Junda Liu
eaacd1e937
Merge "Adding Carrier Config API."
2015-04-16 20:13:52 +00:00
Amith Yamasani
0dbb64d627
Merge "Dump something for AppIdleController"
2015-04-16 20:08:46 +00:00
Alan Viverette
d19512bbfa
Merge "Colored button should be using inverse primary text color"
2015-04-16 20:03:27 +00:00
Selim Cinek
8148f8b6f7
Merge "Fixed the behavior for HUNs with fullscreen intents"
2015-04-16 18:59:34 +00:00
Selim Cinek
31d9ef7a40
Fixed the behavior for HUNs with fullscreen intents
...
Now HUNs with full screen intents don't fire automatically
when added and don't time out anymore when HUN'd
Change-Id: Ic2d5033febe514760cbb4e6e028c3cea84d07cd8
2015-04-16 11:58:41 -07:00
Selim Cinek
80ee14ebb4
Merge "Fixed that disappear animations were disabled"
2015-04-16 18:55:56 +00:00
Selim Cinek
ecc53f4835
Merge "Fixed a bug where the notification size was incorrect"
2015-04-16 18:55:01 +00:00
Selim Cinek
2aab2fb76e
Fixed that disappear animations were disabled
...
Bug: 20165559
Change-Id: I44fd10aee1ad4107ffcf98e103cd8054afb83731
2015-04-16 11:53:43 -07:00
Selim Cinek
60122be674
Fixed a bug where the notification size was incorrect
...
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
2015-04-16 11:53:36 -07:00
Jonathan Basseri
9a1c9b67c4
Adding Carrier Config API.
...
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
2015-04-16 11:40:33 -07:00
Pierre Vandwalle
d10eb9c3eb
Merge changes I847ec3a9,I201b5206
...
* changes:
add HAL PNO config parameter
add disconnected scan parameter, add bytes[] container to scanResults
2015-04-16 18:34:29 +00:00
Deepanshu Gupta
a8ac52d6c4
Merge "resolved conflicts for merge of 186fe7b1 to master"
2015-04-16 18:19:49 +00:00
John Spurlock
f99c656afb
Merge "An update on VolumePanel."
2015-04-16 18:19:05 +00:00
Deepanshu Gupta
4967201a2c
resolved conflicts for merge of 186fe7b1 to master
...
Change-Id: I60886d3e44ae23a11c8f129517df87ee29625ada
2015-04-16 11:18:41 -07:00
Tim Murray
ef0e1c6a0c
Unhide BLAS intrinsics.
...
Change-Id: I3006d878e68cce833d8f26cb5d8a1a660a6f5565
2015-04-16 11:15:43 -07:00
Pierre Vandwalle
37f6b9307d
add HAL PNO config parameter
...
Change-Id: I847ec3a9cbd9f0036a4de7b88667f26f7880d7b1
2015-04-16 11:00:36 -07:00
Pierre Vandwalle
fc197d3923
add disconnected scan parameter, add bytes[] container to scanResults
...
Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
2015-04-16 11:00:36 -07:00
Hiroshi Yamauchi
2052907d02
Merge "Unhide Debug.getRuntimeStat()."
2015-04-16 17:58:40 +00:00
Santos Cordon
0d4e216665
Merge "Move Phone.java APIs into InCallService"
2015-04-16 17:58:16 +00:00
Deepanshu Gupta
186fe7b10f
am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'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.
2015-04-16 17:55:03 +00:00
Santos Cordon
a2492810df
Move Phone.java APIs into InCallService
...
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
2015-04-16 10:54:12 -07:00
Brian Carlstrom
49cb2775a9
am 81d0aabc: am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"
...
* commit '81d0aabcb5af11f8695793dbfac893d17688970e':
Document hprof-conv -z
2015-04-16 17:53:43 +00:00
Deepanshu Gupta
c4affce9df
am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'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.
2015-04-16 17:41:54 +00:00
Brian Carlstrom
81d0aabcb5
am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"
...
* commit '40955edf9dc1e90b337af89543919eec4868dbe0':
Document hprof-conv -z
2015-04-16 17:41:44 +00:00
Brian Carlstrom
40955edf9d
am 14a982aa: Merge "Document hprof-conv -z"
...
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
Document hprof-conv -z
2015-04-16 17:31:34 +00:00
Deepanshu Gupta
1f3c7f3f50
am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
...
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:31:34 +00:00
Alex Klyubin
8ce568e756
am f39aa3d0: am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."
...
* commit 'f39aa3d0898b845ced3128f1778fd04171e4b9a6':
Add IV-related Keymaster error codes.
2015-04-16 17:20:37 +00:00
Alex Klyubin
3abd2b757a
am 22b5d9b9: am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround."
...
* commit '22b5d9b969176a196b0b29ce9441ac3d1d35d208':
Remove IV auto-generation workaround.
2015-04-16 17:20:23 +00:00
Deepanshu Gupta
f18ceefcf0
am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
...
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:19:42 +00:00
Deepanshu Gupta
cd6e00c6d9
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
...
* changes:
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:12:45 +00:00
Brian Carlstrom
14a982aa7a
Merge "Document hprof-conv -z"
2015-04-16 17:08:00 +00:00
Alex Klyubin
f39aa3d089
am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."
...
* commit 'a2607ee4ebef49f88b5656e2eca2db362b32c70d':
Add IV-related Keymaster error codes.
2015-04-16 17:07:51 +00:00
Alex Klyubin
22b5d9b969
am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround."
...
* commit '28a9089f5b79e20ca5b023830255cf438a9cded7':
Remove IV auto-generation workaround.
2015-04-16 17:07:47 +00:00
Brian Carlstrom
d7931acf4a
Document hprof-conv -z
...
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
2015-04-16 10:06:58 -07:00
Chris Watkins
56d16568c0
Merge "Unhide the android.media.[Media]DataSource interface."
2015-04-16 17:06:46 +00:00
Yorke Lee
a22a09666b
Merge "Change hasVoicemailNumber to getVoicemailNumber"
2015-04-16 17:05:19 +00:00
Alex Klyubin
a2607ee4eb
am b9a78c79: Merge "Add IV-related Keymaster error codes."
...
* commit 'b9a78c7939e9b31c807106166cafe65dc5af777d':
Add IV-related Keymaster error codes.
2015-04-16 16:57:12 +00:00
Alex Klyubin
28a9089f5b
am 216d18b9: Merge "Remove IV auto-generation workaround."
...
* commit '216d18b997eb929c2c3af9b2102595f4ec694c20':
Remove IV auto-generation workaround.
2015-04-16 16:57:05 +00:00
Mady Mellor
8d572dd1e2
Merge "New listener to recognize stylus button press gesture in GestureDetector"
2015-04-16 16:55:07 +00:00
Mady Mellor
241e119679
Merge "Recognize stylus touch + press button as a longpress in AbsListView"
2015-04-16 16:54:41 +00:00
Ben Kwa
f8f80c8034
Merge "Fix cancellation of copy jobs."
2015-04-16 16:45:29 +00:00
Ben Kwa
94ac0d7d30
Fix cancellation of copy jobs.
...
Add FLAG_CANCEL_CURRENT to the pending intent for cancellation, to
prevent reuse of previously created cancellation intents. Previously
created intents have non-matching job IDs, which causes the cancellation
intent to be ignored.
BUG=20221969
Change-Id: Ie0afcc6af53a550b44bc4b2f3d48942cdb092a65
2015-04-16 09:43:41 -07:00
Alex Klyubin
b9a78c7939
Merge "Add IV-related Keymaster error codes."
2015-04-16 16:39:31 +00:00
Alex Klyubin
216d18b997
Merge "Remove IV auto-generation workaround."
2015-04-16 16:39:10 +00:00
Yorke Lee
49e2d46812
Change hasVoicemailNumber to getVoicemailNumber
...
Bug: 20223485
Change-Id: I67eb12e2030ec8f73326ade4eb750b0c2f6e52ad
2015-04-16 09:30:57 -07:00
John Spurlock
90be37953d
An update on VolumePanel.
...
Retired, and removed all claimed resources.
VolumeDialog is now the only option.
Bug: 19260237
Change-Id: I6e8abff0f8c16c4e02c47c8b7f24d5703cb3dbdf
2015-04-16 12:14:56 -04:00
Lorenzo Colitti
3f2631f526
Merge changes from topic 'wifi-alternate-reality'
...
* changes:
Pin a process to wifi when it calls enableNetwork(..., true)
Make CALLBACK_PRECHECK actually work.
2015-04-16 16:11:22 +00:00
Robert Greenwalt
064ce64758
Merge "LCE service implementation - connectivity side"
2015-04-16 15:28:04 +00:00