Commit Graph

322320 Commits

Author SHA1 Message Date
Philip P. Moltmann
278685d468 Merge "Remove forward matches before checking for default" into oc-dev am: d53cbfd0dc
am: ba8b3f05b6

Change-Id: Ic35779f6b6ad97dc1a6f83356dfa45e0d5b5f406
2017-05-12 20:29:15 +00:00
Philip P. Moltmann
15a028c929 Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am: 1454afce82
am: 89d98d34cb

Change-Id: I93d3cbb6e0b6e7bbc7a535c0ebf437c16319075f
2017-05-12 20:27:57 +00:00
Svet Ganov
406abd27f1 Merge "Default grant mic, storage, camera to SMS app" into oc-dev am: 422a83de2c
am: f0cf3a95ed

Change-Id: I4f7a8379d6db6cdcc169029b5a13d8f0b2d2eacb
2017-05-12 20:26:05 +00:00
Badhri Jagan Sridharan
59816aaede Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev am: 81e8d4b340
am: 4a45116c4e  -s ours

Change-Id: Icbd7b99a4e15918afcb8dc9f9e53bac7ac9ba6d0
2017-05-12 20:24:48 +00:00
Philip P. Moltmann
ba8b3f05b6 Merge "Remove forward matches before checking for default" into oc-dev
am: d53cbfd0dc

Change-Id: I578c7e50fb9fbe84025508c30a86c6ab4865d385
2017-05-12 19:29:03 +00:00
Philip P. Moltmann
89d98d34cb Merge "Not specify return val of View#onSaveInstanceState" into oc-dev
am: 1454afce82

Change-Id: I070b96a2220c88e40b2d274ca03f5ea6fca04396
2017-05-12 19:24:33 +00:00
Svet Ganov
f0cf3a95ed Merge "Default grant mic, storage, camera to SMS app" into oc-dev
am: 422a83de2c

Change-Id: I483140b0dc20297f941775a34c4e73349a338f75
2017-05-12 19:18:07 +00:00
TreeHugger Robot
d53cbfd0dc Merge "Remove forward matches before checking for default" into oc-dev 2017-05-12 19:17:37 +00:00
Doris Liu
056c47c932 Merge "Fix racy clone" into oc-dev am: a5b396b5cb
am: 2865d7a128

Change-Id: Ib35263dacfc98b8397d32a809b1c82416bcbf450
2017-05-12 19:15:50 +00:00
Badhri Jagan Sridharan
4a45116c4e Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev
am: 81e8d4b340

Change-Id: Ic89a521342d386c9c3caad2766dd95f201c855be
2017-05-12 19:15:18 +00:00
TreeHugger Robot
1454afce82 Merge "Not specify return val of View#onSaveInstanceState" into oc-dev 2017-05-12 19:14:53 +00:00
Stanley Tng
a42a83f8ec Merge "Add Save and Restore of BluetoothOn setting" into oc-dev am: e1a381cf41
am: d6c97a913f

Change-Id: If96b84d1dfc08e37fad1e6e19ef4abd86df71ba9
2017-05-12 19:13:27 +00:00
TreeHugger Robot
422a83de2c Merge "Default grant mic, storage, camera to SMS app" into oc-dev 2017-05-12 19:10:22 +00:00
TreeHugger Robot
81e8d4b340 Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev 2017-05-12 19:07:41 +00:00
Doris Liu
2865d7a128 Merge "Fix racy clone" into oc-dev
am: a5b396b5cb

Change-Id: I718db73f8716b274de9efb94e297e3409ea9b46c
2017-05-12 19:05:25 +00:00
Selim Cinek
dc29c0115a Merge "Fixing the colorization of legacy media notifications" into oc-dev am: 0b84204185
am: d95484c6d6

Change-Id: Idf26743203fb21f545a457d887706165e3efec41
2017-05-12 19:03:09 +00:00
Selim Cinek
3603bb073e Merge "Don't flash colors when hinting" into oc-dev am: 275e0582c3
am: 8a7b5d5807

Change-Id: I6070e62da134660885721011ac77a0027ba8420c
2017-05-12 19:00:52 +00:00
Stanley Tng
d6c97a913f Merge "Add Save and Restore of BluetoothOn setting" into oc-dev
am: e1a381cf41

Change-Id: Iced79a09a651676037718a6553cab7b16158ac14
2017-05-12 18:54:39 +00:00
Selim Cinek
d95484c6d6 Merge "Fixing the colorization of legacy media notifications" into oc-dev
am: 0b84204185

Change-Id: I3015d7234d1d92712ec91de82d66e3ce23288795
2017-05-12 18:52:42 +00:00
Selim Cinek
d0a96399b4 Merge "Fixing flakey tests" into oc-dev am: 5c857027bb
am: df16d9ba23

Change-Id: I05922b665e6c737e7212223124a6f7f9bfb06da2
2017-05-12 18:48:44 +00:00
Selim Cinek
8a7b5d5807 Merge "Don't flash colors when hinting" into oc-dev
am: 275e0582c3

Change-Id: I60b8d4e356202d1ddef57a9c51976b514d527928
2017-05-12 18:48:00 +00:00
TreeHugger Robot
6298fba53a Merge "Add SlashDrawable support to WorkMode tile" 2017-05-12 18:44:58 +00:00
Selim Cinek
df16d9ba23 Merge "Fixing flakey tests" into oc-dev
am: 5c857027bb

Change-Id: I333afa8df38c565e75ef660b54b18b44e2e1414d
2017-05-12 18:42:42 +00:00
TreeHugger Robot
a5b396b5cb Merge "Fix racy clone" into oc-dev 2017-05-12 18:38:34 +00:00
TreeHugger Robot
e1a381cf41 Merge "Add Save and Restore of BluetoothOn setting" into oc-dev 2017-05-12 18:38:00 +00:00
Jorim Jaggi
ff48757912 Merge "Don't set keyguard state to showing when service disabled" into oc-dev am: 6f5328a2cd
am: ef40fb33eb

Change-Id: Ia63b1af06aedbb73396401ee0a5b2bba38bfe523
2017-05-12 18:37:54 +00:00
Selim Cinek
0b84204185 Merge "Fixing the colorization of legacy media notifications" into oc-dev 2017-05-12 18:35:23 +00:00
Selim Cinek
275e0582c3 Merge "Don't flash colors when hinting" into oc-dev 2017-05-12 18:32:55 +00:00
Selim Cinek
5c857027bb Merge "Fixing flakey tests" into oc-dev 2017-05-12 18:32:30 +00:00
Jorim Jaggi
ef40fb33eb Merge "Don't set keyguard state to showing when service disabled" into oc-dev
am: 6f5328a2cd

Change-Id: I7bb58b1dc8e8c82f14da9c9e7e39c86509449ed5
2017-05-12 18:28:12 +00:00
TreeHugger Robot
c6b707a356 Merge "Copy preopted profiles to ref for first boot" 2017-05-12 18:23:18 +00:00
Sudheer Shanka
36310290a4 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev am: 5df9c5570e
am: 3ae1662024

Change-Id: I1954ae85025dabfebf452228b199cab07e892be2
2017-05-12 18:18:24 +00:00
TreeHugger Robot
6f5328a2cd Merge "Don't set keyguard state to showing when service disabled" into oc-dev 2017-05-12 18:16:23 +00:00
TreeHugger Robot
095b183889 Merge "Refactor suggestion parser." 2017-05-12 18:14:52 +00:00
Android Build Merger (Role)
776b782f00 Merge "Merge "More QS theme fixes for contrast" into oc-dev am: 3ad8c93e96 am: 9d9655a650 -s ours" 2017-05-12 18:09:43 +00:00
Sudheer Shanka
3ae1662024 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
am: 5df9c5570e

Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7
2017-05-12 18:09:36 +00:00
Jason Monk
4d1c258a35 Merge "More QS theme fixes for contrast" into oc-dev am: 3ad8c93e96
am: 9d9655a650  -s ours

Change-Id: I5aa5739be8e761bb12bb4d5fc83f841056d84a25
2017-05-12 18:08:46 +00:00
TreeHugger Robot
4075fd9c16 Merge "Fix broken MenuItem coretests" 2017-05-12 18:08:36 +00:00
Sudheer Shanka
5df9c5570e Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev 2017-05-12 18:02:43 +00:00
Stanley Tng
873b5708d1 Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.

Bug: 35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
(cherry picked from commit 767f05feea)
2017-05-12 18:00:55 +00:00
Jason Monk
cbd757a719 Merge "More QS theme fixes for contrast" into oc-dev am: 3ad8c93e96
am: 9d9655a650  -s ours

Change-Id: I5579472ff5e9018bacf14e6f1ec61f06dab4f3c9
2017-05-12 17:55:30 +00:00
Jason Monk
9d9655a650 Merge "More QS theme fixes for contrast" into oc-dev
am: 3ad8c93e96

Change-Id: I85e10238ddfceec5cc497868d506e8a3361fb03a
2017-05-12 17:39:20 +00:00
Android Build Merger (Role)
d4c353da81 Merge "Merge "Make sure fd is always initialized" into oc-dev am: b827c5234c am: cc133c1265" 2017-05-12 17:38:31 +00:00
Svetoslav Ganov
e78812df0b Merge "Make sure fd is always initialized" into oc-dev am: b827c5234c
am: cc133c1265

Change-Id: I79ec9a7eb92f5fc2fb93a89a2f076d0eb57c2eb9
2017-05-12 17:37:27 +00:00
TreeHugger Robot
7ede1c157e Merge "Fix recent apps in system UI for Skia pipeline" 2017-05-12 17:36:53 +00:00
TreeHugger Robot
3ad8c93e96 Merge "More QS theme fixes for contrast" into oc-dev 2017-05-12 17:33:11 +00:00
Evan Laird
351e44462e Add SlashDrawable support to WorkMode tile
Will have to recenter the WorkMode tile itself, as the slash is
dead-center now but the tile isn't.

Test: visual; runtest systemui
Change-Id: Iebc52702b7a735378801815105cf2e67b7276ac1
2017-05-12 13:32:30 -04:00
Svetoslav Ganov
cc133c1265 Merge "Make sure fd is always initialized" into oc-dev
am: b827c5234c

Change-Id: Ifdb14e0d6a79402f8c04fd36b342d1fdfd4a4950
2017-05-12 17:28:21 +00:00
Svet Ganov
1a99d36d56 Default grant mic, storage, camera to SMS app
Test: CTS tests updated in same topic

bug:36713956

Change-Id: I496d8f8dac86594956dcdeb5afafa5b210e28de4
2017-05-12 17:17:14 +00:00
Svetoslav Ganov
b827c5234c Merge "Make sure fd is always initialized" into oc-dev 2017-05-12 17:16:38 +00:00