Robert Greenwalt
3a9f0175ba
Merge "Update RouteInfo docs and make public."
2014-05-18 23:24:59 +00:00
Jinsuk Kim
fc9c89f9aa
Merge "HdmiControlManager with HdmiPlaybackClient API definition"
2014-05-18 22:50:16 +00:00
Jinsuk Kim
91120c541a
HdmiControlManager with HdmiPlaybackClient API definition
...
This is a rewrite of HdmiCecManager that exposes API for CEC Playback
device control. HdmiCecManager will be removed together with
HdmiCecService once the migration is completed.
Replaced direct access to CEC commands with the following 2 API:
- oneTouchPlay
- queryDisplayStatus
Each method requires communication with other device on CEC bus,
hence might take some time to finish. The result at the end of
protocol exchange is reported through a callback provided as a
parameter to the method.
The callback is based on interface not abstract class since
it has only one method 'onComplete'.
Change-Id: I41e9d4571f890303282a79a803c86530d0b46974
2014-05-19 07:46:26 +09:00
John Spurlock
a25a160340
Merge "VolumeZen: frameworks changes to support Settings."
2014-05-18 21:32:41 +00:00
Adam Powell
236bcc3ad1
Merge "Action bar refactoring, round 1"
2014-05-18 21:08:05 +00:00
Robert Greenwalt
4095bd5a88
Update RouteInfo docs and make public.
...
Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16
2014-05-18 12:43:14 -07:00
Robert Greenwalt
5575def80c
Merge "Update comments for LinkAddress"
2014-05-18 18:26:10 +00:00
Yuhao Zheng
a486447231
Hotspot 2.0 framework APIs -- initial implementation
...
Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4
Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
2014-05-18 09:41:35 -07:00
Robert Greenwalt
fd202e6f84
Update comments for LinkAddress
...
In preparation for CS api review.
Change-Id: Ib933e905846ebd039d96a523946dd8fdb10f3ff1
2014-05-18 09:39:18 -07:00
John Spurlock
74a2e06d83
VolumeZen: frameworks changes to support Settings.
...
- Pull SeekBarVolumizer out into a separately reusable class.
- Make register/unregisterOnActivityStopListener avail to system code.
- Add new setting for displaying suppressed notifications in zen mode.
Change-Id: Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d
2014-05-18 12:26:21 -04:00
Alan Viverette
677a9f2496
Merge "Fix onHardwarePreDraw call in ThreadedRenderer"
2014-05-17 23:37:42 +00:00
Alan Viverette
d5b2ec4ff1
Fix onHardwarePreDraw call in ThreadedRenderer
...
Change-Id: Ia3852cbd7afc21e9f57824e9f207ba02acae12a7
2014-05-17 16:34:09 -07:00
Adam Powell
4369e7d0b0
Action bar refactoring, round 1
...
Decouple PhoneWindow and ActionBarView to allow for using Toolbar in
some circumstances later.
Change-Id: I907743e06c3a1203e21cfd84860a1884c66f3527
2014-05-17 14:16:08 -07:00
Ruben Brunk
f967a5486a
camera2: Plumb DngCreator to native library.
...
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
2014-05-16 23:25:51 -07:00
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
cb9fbc3a30
Enforce that trust agents declare the BIND_TRUST_AGENT permission
...
Change-Id: Iba10b6fb140362c368fb12b7d3c6be550897de40
2014-05-17 03:19:56 +02: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
Winson Chung
1e8d71b605
Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)
...
Change-Id: Icc5d2a784ed3c3c27143eb04cbb4305549ee223a
2014-05-17 00:31:50 +00:00
RoboErik
42ea7eecd1
Rename session classes to have media prefix, hide routes
...
This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.
Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
2014-05-16 16:40:17 -07: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
87cd0dc425
Add KEYCODE_PAIRING.
...
Used for initiating a peripheral pairing mode.
Change-Id: I8e172bdda1f3c34eff36f3001c174f7a6b6e6e41
2014-05-16 15:14:53 -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
Dianne Hackborn
dcff99598f
Hide voice interaction APIs.
...
Change-Id: I961b6399a6edca239caaba9bbd1dd5e03bc612bd
2014-05-16 14:32:35 -07:00
Emily Bernier
45775c4f93
Connect user audio restrictions to app ops.
...
Setting DISALLOW_ADJUST_VOLUME sets the relevant app ops as well,
blocking calls in AudioService.
Change-Id: I256b294465fc2e8b93cb0389b21299eacf0efb95
2014-05-16 17:18:20 -04:00
Matthew Williams
4b291fbffc
Merge "TM TaskServiceContext implementation"
2014-05-16 20:48:46 +00: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
Alan Viverette
22fc9e4a24
Merge "Add drawable padding to check box and radio button styles"
2014-05-16 20:04:44 +00: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
Selim Gurun
4455f54b5b
Merge "Add a setting for data reduction proxy key"
2014-05-16 19:09:10 +00:00
Raph Levien
e517ce4563
Merge "Get rid of dirFlags log spam"
2014-05-16 18:59:03 +00:00
Raph Levien
b98de0dcd6
Get rid of dirFlags log spam
...
I was logging the BiDi flags for debugging, did not mean to commit this.
Change-Id: I0a89c68fe17562f2ed38843efacbaa310dca24fa
2014-05-16 11:50:50 -07:00
Selim Gurun
178201f7ff
Add a setting for data reduction proxy key
...
Bug: 12492817
Change-Id: I15c42d631f6ba9ab4dcce38e96f0486efaf3d22f
2014-05-16 11:50:37 -07:00
Igor Murashkin
9d08a93b2d
Merge "camera2: Move parameters around to different packages"
2014-05-16 18:08:41 +00:00
Dianne Hackborn
9a75543006
Fix recording of wake_lock_in.
...
There was a bug that would allow the nesting count
to get off. Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.
Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
2014-05-16 10:46:33 -07:00
Griff Hazen
a13bfae217
am cfa27161: am 50c11659: Fix Notification sdk docs build.
...
* commit 'cfa271618f5b33eae200c97c6c3624df9d04efc2':
Fix Notification sdk docs build.
2014-05-16 17:41:28 +00:00
John Reck
6d6ce03a03
resolved conflicts for merge of 313c5f38 to master
...
Conflicts:
core/java/android/view/HardwareRenderer.java
Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
2014-05-16 10:38:14 -07:00
Matthew Williams
691e93e82c
TM TaskServiceContext implementation
...
Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.
Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
2014-05-16 10:33:48 -07:00
Jason Monk
8974f24909
Merge "Notify AppOpsService of UserRestrictions and Owners"
2014-05-16 17:30:31 +00:00
Dan Sandler
843adbba6a
Merge "Missing progress bar style."
2014-05-16 17:30:21 +00:00