Jason Monk
338ef17396
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev am: f10fcafcdf
...
am: 8a9769d60f
2017-06-28 13:51:58 +00:00
Jason Monk
8a9769d60f
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
...
am: f10fcafcdf
2017-06-28 13:44:40 +00:00
Jason Monk
272f4b41b6
Merge "Fix a11y volume not always being shown" into oc-dr1-dev am: e060044217
...
am: 700dfde82b
2017-06-28 13:41:10 +00:00
Jason Monk
f10fcafcdf
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
2017-06-28 13:37:51 +00:00
Jason Monk
700dfde82b
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
...
am: e060044217
2017-06-28 13:33:44 +00:00
Jason Monk
daece35dc3
Merge "Add plugin to swap out recents" into oc-dr1-dev am: a69c03b6b1
...
am: 84510887b0
2017-06-28 13:30:37 +00:00
Jason Monk
e060044217
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
2017-06-28 13:26:42 +00:00
Jason Monk
84510887b0
Merge "Add plugin to swap out recents" into oc-dr1-dev
...
am: a69c03b6b1
2017-06-28 13:24:16 +00:00
Julia Reynolds
36c387efcb
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev am: 48ab20a645
...
am: dcac8500a6
2017-06-28 13:20:36 +00:00
Jason Monk
a69c03b6b1
Merge "Add plugin to swap out recents" into oc-dr1-dev
2017-06-28 13:15:54 +00:00
Julia Reynolds
dcac8500a6
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
...
am: 48ab20a645
2017-06-28 13:13:09 +00:00
TreeHugger Robot
48ab20a645
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
2017-06-28 13:06:58 +00:00
TreeHugger Robot
77bada7e98
Merge "Fix ACTION_PROVISIONING_SUCCESSFUL documentation"
2017-06-28 12:00:32 +00:00
Esteban Talavera
4047bae5db
Fix ACTION_PROVISIONING_SUCCESSFUL documentation
...
The current documentation implies that the intent is sent to the
application that requested provisioning (which would be in the
primary profile for managed profile provisioning). However it is
sent to the new DO or PO only.
Test: make docs
Change-Id: I9d1f66ec6f3d6d7fbaa1617d13a7da12d4acb490
2017-06-28 11:03:09 +01:00
Jack He
e70848b8a9
Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70 am: 96f98f255b am: 3b22538b46
...
am: 45c074d406
2017-06-28 08:50:29 +00:00
Jack He
45c074d406
Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70 am: 96f98f255b
...
am: 3b22538b46
2017-06-28 08:44:01 +00:00
Jack He
3b22538b46
Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70
...
am: 96f98f255b
2017-06-28 08:37:50 +00:00
Jack He
96f98f255b
Merge "Add APIs to get remote device's battery level (1/2)"
...
am: ceaccbfe70
2017-06-28 08:32:54 +00:00
Treehugger Robot
ceaccbfe70
Merge "Add APIs to get remote device's battery level (1/2)"
2017-06-28 08:26:16 +00:00
pkanwar
ff196ec7bb
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev am: 189e5323f1 -s ours
...
am: 84b4ed41ba
2017-06-28 05:24:55 +00:00
pkanwar
84b4ed41ba
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
...
am: 189e5323f1
2017-06-28 05:18:29 +00:00
TreeHugger Robot
189e5323f1
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
2017-06-28 05:11:34 +00:00
Jean-Michel Trivi
b777252139
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev am: 8f81919093
...
am: 051285b648
2017-06-28 03:33:03 +00:00
Jean-Michel Trivi
051285b648
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
...
am: 8f81919093
2017-06-28 03:25:45 +00:00
Jean-Michel Trivi
8f81919093
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
2017-06-28 03:16:58 +00:00
TreeHugger Robot
c1323664d4
Merge "Make the android.R.string.autofill public."
2017-06-28 01:55:57 +00:00
Jean-Michel Trivi
92ed7bf412
AudioService: internal API for disabling audio playback for a UID
...
Internal API, available through AudioManagerInternal, to flag
a UID as having lost the ability to play audio. When that
happens, all players associated with this UID are paused, and
future players are immediately paused when they report they
started.
Users of this API must "enable" a previously banned UID when
it is no longer in use.
Test: upcoming manual test with background apps
Bug: 34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23
2017-06-27 17:57:34 -07:00
Adrian Roos
366d27d31e
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev am: 01eb71112c
...
am: 60100296b9
2017-06-28 00:41:23 +00:00
Adrian Roos
60100296b9
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
...
am: 01eb71112c
2017-06-28 00:35:26 +00:00
Adam Lesinski
d4fc4a6915
Merge "AAPT2: Fix issues with parsing integers + floats"
2017-06-28 00:34:04 +00:00
Michael Wright
5762891e9a
Merge "Update fingerprint haptic patterns" into oc-dr1-dev am: 4e1050f1cf
...
am: 927a8f19f4
2017-06-28 00:32:23 +00:00
pkanwar
db07b66d3a
Radio Interface changes to pass the encryption object, including the
...
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
(cherry picked from commit 6d50fec388
2017-06-28 00:31:58 +00:00
TreeHugger Robot
01eb71112c
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
2017-06-28 00:27:41 +00:00
Michael Wright
927a8f19f4
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
...
am: 4e1050f1cf
2017-06-28 00:26:25 +00:00
TreeHugger Robot
4e1050f1cf
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
2017-06-28 00:16:30 +00:00
Jack He
1d312bfa78
Add APIs to get remote device's battery level (1/2)
...
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
that remote device's battery level has changed
Bug: 35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
2017-06-27 16:53:09 -07:00
Jason Monk
0cdd7b7420
Merge "Update nav bar layout for universal grid" into oc-dr1-dev am: bf15050a0c
...
am: 33c9314ce1
2017-06-27 23:04:17 +00:00
Jason Monk
33c9314ce1
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
...
am: bf15050a0c
2017-06-27 22:57:51 +00:00
TreeHugger Robot
bf15050a0c
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
2017-06-27 22:50:01 +00:00
Christopher Tate
9005090f61
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev am: cbd1f32fdb
...
am: 5cff1f9e2f
2017-06-27 22:42:20 +00:00
Christopher Tate
5cff1f9e2f
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
...
am: cbd1f32fdb
2017-06-27 22:36:18 +00:00
TreeHugger Robot
cbd1f32fdb
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
2017-06-27 22:30:16 +00:00
Christine Franks
a1d9d3bfbb
Merge "Blacklist Night display settings for testing" into oc-dr1-dev am: 4608c69f23
...
am: 02808bc7c9
2017-06-27 22:09:27 +00:00
Michal Karpinski
d9ae80ee26
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am: 0d1b1a253a am: a96694b49b
...
am: ccacc2d5b0
2017-06-27 22:07:24 +00:00
Todd Kennedy
b452727726
Merge "Merge "Use content type specified on the command line" into oc-dev am: f89bf30312" into oc-dr1-dev am: d635fb2003
...
am: 5f59c49e37
2017-06-27 21:59:45 +00:00
Christine Franks
02808bc7c9
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
...
am: 4608c69f23
2017-06-27 21:59:34 +00:00
Michal Karpinski
ccacc2d5b0
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am: 0d1b1a253a
...
am: a96694b49b
2017-06-27 21:57:50 +00:00
Evan Laird
b8c796a2d1
Merge "Set bolt and plus colors together" into oc-dr1-dev am: c86a5dbee4
...
am: b46ac20120
2017-06-27 21:53:56 +00:00
Christine Franks
4608c69f23
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
2017-06-27 21:52:18 +00:00
Todd Kennedy
5f59c49e37
Merge "Merge "Use content type specified on the command line" into oc-dev am: f89bf30312" into oc-dr1-dev
...
am: d635fb2003
2017-06-27 21:51:18 +00:00
