Joe LaPenna
a0fc1b3730
am 3e1bbaf7: am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
...
* commit '3e1bbaf786c12e66624c42c13a58095bc8133117':
Log accept and close debug statements in BluetoothSocket.
2014-05-17 02:01:42 +00:00
Joe LaPenna
3e1bbaf786
am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
...
* commit '45734b4ae180ea3c34f92575b3ed362bbf4f20e5':
Log accept and close debug statements in BluetoothSocket.
2014-05-17 01:57:44 +00:00
Joe LaPenna
45734b4ae1
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
2014-05-17 01:55:06 +00:00
Adrian Roos
7643422fb6
Merge "Enforce that trust agents declare the BIND_TRUST_AGENT permission"
2014-05-17 01:31:34 +00:00
Adrian Roos
eb5e1089ac
Merge "Implement system bar color runtime API"
2014-05-17 01:30:09 +00:00
Adrian Roos
cb9fbc3a30
Enforce that trust agents declare the BIND_TRUST_AGENT permission
...
Change-Id: Iba10b6fb140362c368fb12b7d3c6be550897de40
2014-05-17 03:19:56 +02:00
Adrian Roos
34e6544551
Implement system bar color runtime API
...
Change-Id: Iacf36c6d92a2f779eb933218817721c8ed3c3344
2014-05-17 03:13:11 +02:00
Michael Wright
23041ac432
am d55fa5d5: am 3a123fda: am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
...
* commit 'd55fa5d584f580d75a0e7014d961e070b541ba90':
Add support for Latvian (qwerty) keyboard mapping
2014-05-17 01:13:03 +00:00
Michael Wright
d55fa5d584
am 3a123fda: am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
...
* commit '3a123fda8a48519601b8782845dfb176de16d871':
Add support for Latvian (qwerty) keyboard mapping
2014-05-17 01:09:43 +00:00
Michael Wright
3a123fda8a
am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
...
* commit '0a5236a7cd3fa5a62a97f14a512dbeb5eb34772a':
Add support for Latvian (qwerty) keyboard mapping
2014-05-17 01:06:51 +00:00
Chris Craik
91b5c658d9
Fix build
...
Change-Id: Ic0b36cd0f6525c4bc1ad365cd089e9a9fac9dc17
2014-05-16 18:04:03 -07:00
Michael Wright
0a5236a7cd
Merge "Add support for Latvian (qwerty) keyboard mapping"
2014-05-17 01:02:55 +00:00
Michael Wright
d27a69c40d
Merge "Add InputStage debugging logs"
2014-05-17 00:44:35 +00:00
Winson Chung
71dc28b11e
Merge "Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)"
2014-05-17 00:35:21 +00:00
Christopher Tate
27fb0eec90
Merge "Add idle-state controller for the Task Manager"
2014-05-17 00:11:10 +00:00
Christopher Tate
851f3d5110
Add idle-state controller for the Task Manager
...
"Idle time" is currently defined to begin ~ an hour (actually slightly
more) after the screen turns off and/or dreaming begins. Screen-on
and dreams-ending are the triggers for declaring "idle" time to be
over.
Bug 14993295
Change-Id: I0898871d5b76a52d647ae2ebcb1b2f941ec45e79
2014-05-16 16:55:22 -07:00
Lorenzo Colitti
1bc91f0d2e
Merge "Stop clatd when starting the Nat464Xlat service."
2014-05-16 23:52:52 +00:00
Eric Laurent
c5baa18806
Merge "AudioSystem: native to JAVA status translation"
2014-05-16 23:37:50 +00:00
Dianne Hackborn
f2eba13932
Merge "Hide voice interaction APIs."
2014-05-16 23:32:00 +00:00
Winson Chung
a449dc033b
Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)
...
Change-Id: I582221468e63a96a5dfd132a31b09e72099b170f
2014-05-16 16:24:21 -07:00
Eric Laurent
bc11a696f6
AudioSystem: native to JAVA status translation
...
Regroup status code translation from native to JAVA in AudioSystem.
The same codes will be used by AudioTrack, AudioRecord, AudioManager
and defined in a single place in AudioSystem.
Change-Id: I7d3f39f30e3bb8e53f33f4408bcb0672df8af42b
2014-05-16 15:50:42 -07:00
Tim Kilbourn
b8f5cae141
Merge "Add KEYCODE_PAIRING."
2014-05-16 22:41:17 +00:00
Amith Yamasani
3a48359443
Use correct package name for profile owner
...
Fixes reboot loop when you have a managed profile on your device.
Change-Id: I935ded447f226ee0507d3dcf22a730a7fb61a0c0
2014-05-16 15:25:33 -07:00
Tim Kilbourn
87cd0dc425
Add KEYCODE_PAIRING.
...
Used for initiating a peripheral pairing mode.
Change-Id: I8e172bdda1f3c34eff36f3001c174f7a6b6e6e41
2014-05-16 15:14:53 -07:00
Matthew Williams
b8b99c0fc0
Merge "Refactored code didn't make it into previous CL"
2014-05-16 21:50:38 +00:00
Matthew Williams
fdd9203192
Refactored code didn't make it into previous CL
...
Change-Id: I7ec93e783267d0c0fb39fbc8d0abe7270bdaea68
2014-05-16 14:48:39 -07:00
John Reck
4b300d7dcb
Merge "Add missing fence()"
2014-05-16 21:47:33 +00:00
John Reck
44ac42a6c9
Add missing fence()
...
Bug: 14995924
Change-Id: I991fe74f01468b1b7e34aee0455dc419637f5c8d
2014-05-16 14:46:07 -07:00
Selim Cinek
ac13a9b741
Merge "Implemented visual speed-bump for notifications."
2014-05-16 21:43:29 +00:00
Dianne Hackborn
dcff99598f
Hide voice interaction APIs.
...
Change-Id: I961b6399a6edca239caaba9bbd1dd5e03bc612bd
2014-05-16 14:32:35 -07:00
Selim Cinek
c27437b7fd
Implemented visual speed-bump for notifications.
...
The separation between the important and the less important
notifications has now a visual representation.
Bug: 14607473
Change-Id: I8baa0a08924ec041be2884a2834139477313ab40
2014-05-16 23:19:28 +02:00
Lorenzo Colitti
43b76dfddb
Stop clatd when starting the Nat464Xlat service.
...
If a runtime restart happens while clatd was running, we try to
start clatd, which causes a fatal exception because netd returns
a 400 error (clatd already started.
Bug: 13450716
Bug: 15012035
Change-Id: I102a06d6193fb5f4a1ebe5ad52e5647ff72ca0da
2014-05-16 14:02:13 -07:00
Matthew Williams
4b291fbffc
Merge "TM TaskServiceContext implementation"
2014-05-16 20:48:46 +00:00
Evan Charlton
605a07be7b
Merge "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."""
2014-05-16 20:39:02 +00:00
Evan Charlton
695085c7f2
Merge "Revert "Revert "Expose sendEnvelope."""
2014-05-16 20:38:57 +00:00
Evan Charlton
b8894ab1ae
Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
...
This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.
Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
2014-05-16 13:31:26 -07:00
Alan Viverette
62cb534edb
Merge "Update ripple behavior, use render thread animation"
2014-05-16 20:29:08 +00:00
Alan Viverette
ad2f8e334f
Update ripple behavior, use render thread animation
...
Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
2014-05-16 13:28:33 -07:00
Deepanshu Gupta
779b59ced2
Merge "Add a script to rename fonts for SDK."
2014-05-16 20:27:11 +00:00
Adrian Roos
4b0ec7e924
Merge "Trust Agents: Withhold trust until user has authenticated"
2014-05-16 20:13:30 +00:00
Adrian Roos
dc0d5d1850
Merge "Trust Agents: Implement DPM override"
2014-05-16 20:13:20 +00:00
Alan Viverette
22fc9e4a24
Merge "Add drawable padding to check box and radio button styles"
2014-05-16 20:04:44 +00:00
Evan Charlton
210889e91c
Revert "Revert "Expose sendEnvelope.""
...
This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
2014-05-16 12:50:13 -07:00
Dianne Hackborn
3fce73a866
Merge "Fix recording of wake_lock_in."
2014-05-16 19:42:54 +00:00
Amith Yamasani
891e65c5ce
Merge "Variant of sendBroadcast with appOp flag for cross-user."
2014-05-16 19:40:20 +00:00
Amith Yamasani
3cf75729d5
Variant of sendBroadcast with appOp flag for cross-user.
...
Needed for delivering SMS notifications to multiple users.
Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
2014-05-16 12:37:29 -07:00
Deepanshu Gupta
ad3f288311
Add a script to rename fonts for SDK.
...
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.
Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
2014-05-16 12:31:24 -07:00
Adrian Roos
7046bfd054
Trust Agents: Withhold trust until user has authenticated
...
Bug: 14229695
Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
2014-05-16 21:24:29 +02:00
Selim Gurun
4455f54b5b
Merge "Add a setting for data reduction proxy key"
2014-05-16 19:09:10 +00:00
Jason Monk
20f98b0561
Merge "Fix NPE in DevicePolicyManagerService"
2014-05-16 18:59:58 +00:00