OSDN Git Service
Todd Kennedy [Thu, 8 Jun 2017 06:05:26 +0000 (06:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978 am:
ddb322a000
am:
b524ada719
Change-Id: Ib386ad8d8b5b2de2d93bcbf868d056bad4b3e801
Jeff Sharkey [Thu, 8 Jun 2017 06:03:17 +0000 (06:03 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
b1a2cde4fd" into oc-dr1-dev-plus-aosp
am:
c5deced1d8
Change-Id: Ib08956194b971823a44c7ad77791dfcc87362210
Ian Pedowitz [Thu, 8 Jun 2017 06:00:47 +0000 (06:00 +0000)]
Merge "Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev am:
be261948cb" into oc-dr1-dev-plus-aosp
am:
c9208d362f
Change-Id: Id71b9a4465bd38d8f126a7532b91511a8270950d
Sudheer Shanka [Thu, 8 Jun 2017 05:53:17 +0000 (05:53 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e am:
736cb0e33a
am:
54a6869814
Change-Id: I5e4151095fe8e7790cae7c2512d8ef609076189f
Todd Kennedy [Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
ddb322a000
Change-Id: Ic3ba662f2821aa617be0fa271e92e6cb805097c8
Android Build Merger (Role) [Thu, 8 Jun 2017 05:49:10 +0000 (05:49 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
b1a2cde4fd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 05:48:45 +0000 (05:48 +0000)]
Merge "Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev am:
be261948cb" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 05:48:21 +0000 (05:48 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504
am:
b1a2cde4fd
Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542
Ian Pedowitz [Thu, 8 Jun 2017 05:47:17 +0000 (05:47 +0000)]
Merge "resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
851bfc38d4
Change-Id: I09268e99da114cdd679f0b7d0b56e9641c79c1df
Ian Pedowitz [Thu, 8 Jun 2017 05:46:25 +0000 (05:46 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
am:
be261948cb
Change-Id: I5f990815a7489828589303ee894ba3c94d6ef370
Sudheer Shanka [Thu, 8 Jun 2017 05:45:37 +0000 (05:45 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e
am:
736cb0e33a
Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a
Ian Pedowitz [Thu, 8 Jun 2017 05:42:17 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
Ian Pedowitz [Thu, 8 Jun 2017 05:41:34 +0000 (05:41 +0000)]
Merge "Fixed an issue where the icons had the wrong color"
Etan Cohen [Thu, 8 Jun 2017 05:38:18 +0000 (05:38 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev am:
89d6859dc4
am:
d35a439a90
Change-Id: Id682350948bbf0687700cbcd9d74e860cf5692df
Etan Cohen [Thu, 8 Jun 2017 05:32:09 +0000 (05:32 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
am:
89d6859dc4
Change-Id: Ib7dcbb63d9e41c8b9b3c702f883c84de06a23326
Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
Kevin Chyn [Thu, 8 Jun 2017 04:59:30 +0000 (04:59 +0000)]
Add setting and permission for assist gesture am:
4fddc9fa4d
am:
f0e1d6eab8 -s ours
Change-Id: Iaa5eb3ba4d6570563e838e30581560ff94a9936f
Kevin Chyn [Thu, 8 Jun 2017 04:53:31 +0000 (04:53 +0000)]
Add setting and permission for assist gesture
am:
4fddc9fa4d
Change-Id: Ife2ee905017b3a7489b4a338f6ebe59301301bd0
Mathieu Chartier [Thu, 8 Jun 2017 04:48:26 +0000 (04:48 +0000)]
Merge "Add system property for hot startup method threshold"
TreeHugger Robot [Thu, 8 Jun 2017 04:45:04 +0000 (04:45 +0000)]
Merge "Add permission CHANGE_HDMI_CEC_ACTIVE_SOURCE"
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
TreeHugger Robot [Thu, 8 Jun 2017 04:39:19 +0000 (04:39 +0000)]
Merge "Add setting and permission for assist gesture"
Adrian Roos [Thu, 8 Jun 2017 02:58:09 +0000 (02:58 +0000)]
Merge "Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a am:
dacd9ed196" into oc-dr1-dev-plus-aosp
am:
1520d813e0
Change-Id: I6948db4d1207b2152f1a92d49bfa36d6dae16998
Adrian Roos [Thu, 8 Jun 2017 02:55:54 +0000 (02:55 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a am:
b42e50a3a0
am:
fcaf2d1ae9
Change-Id: Ibb377673586caba3e9af9a5cdf8df8a21314d61b
Ian Pedowitz [Thu, 8 Jun 2017 01:07:43 +0000 (18:07 -0700)]
resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Adrian Roos [Thu, 8 Jun 2017 02:53:24 +0000 (02:53 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev am:
4317e457ba
am:
813d6177bc
Change-Id: If4b837794a8ef352d2fe6d6c0ae41717b0fed805
Ian Pedowitz [Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)]
resolve merge conflicts of
695f21a66189 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Bryce Lee [Thu, 8 Jun 2017 02:51:11 +0000 (02:51 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
cf8cfc4412" into oc-dr1-dev-plus-aosp
am:
983a3c4f5b
Change-Id: I355fffa538cd5dfe125927a2ec5abcd0188bc9c5
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
Fixed an issue where the icons had the wrong color
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
(cherry picked from commit
a7c69637f8fa7cc8c0e7ac7c4d73659730315841)
Change-Id: I558447f282bb54f13be1622c3f2528a383fbc3b7
Fixes:
62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Bryce Lee [Thu, 8 Jun 2017 02:48:41 +0000 (02:48 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
50caf4af60" into oc-dr1-dev-plus-aosp
am:
3b0ceaf0b1
Change-Id: I6f64c86786c9bf33587586b7aed5164e8d1fdde8
Sundeep Ghuman [Thu, 8 Jun 2017 02:44:29 +0000 (02:44 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad am:
8d4014995d
am:
1a58d16f74
Change-Id: Id4aa718f6aba1b04a315bd26023f31a307d01d6e
Sundeep Ghuman [Thu, 8 Jun 2017 02:42:10 +0000 (02:42 +0000)]
Merge "Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad am:
216f596cee" into oc-dr1-dev-plus-aosp
am:
f10bf2902d
Change-Id: I33161b617d1951dd70877bfdafd08d6f1dbf9a2f
Sundeep Ghuman [Thu, 8 Jun 2017 02:39:17 +0000 (02:39 +0000)]
Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours am:
788b2b9364 -s ours" into oc-dr1-dev-plus-aosp
am:
e21b705f13 -s ours
Change-Id: I01a632851b1889e271c0310d55cf9cf2fec6242d
Sundeep Ghuman [Thu, 8 Jun 2017 02:34:47 +0000 (02:34 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 am:
8695bda38e -s ours
am:
c633a31fda -s ours
Change-Id: I99577e810d4c25a59baf092f64270885ea6733f8
Selim Cinek [Thu, 8 Jun 2017 02:31:44 +0000 (02:31 +0000)]
Merge "resolve merge conflicts of
383cc530492e to master"
Selim Cinek [Thu, 8 Jun 2017 01:44:53 +0000 (18:44 -0700)]
resolve merge conflicts of
383cc530492e to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52ee72a7e09792c604eb7cb4a76a6657f808e720
TreeHugger Robot [Thu, 8 Jun 2017 01:29:39 +0000 (01:29 +0000)]
Merge "Update wifi_wakeup_available default setting."
Sanket Padawe [Thu, 8 Jun 2017 01:26:43 +0000 (01:26 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035 am:
6ef238a51c
am:
2fe6328048
Change-Id: I519d432b5a9c46c2a7c0a5f9a52e5de115b11e74
Sanket Padawe [Thu, 8 Jun 2017 01:22:19 +0000 (01:22 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035 am:
6acd6102c9
am:
4170c83598
Change-Id: I10f9ed50310eb8975259d1c54b6369a31e886626
Jorim Jaggi [Thu, 8 Jun 2017 01:16:09 +0000 (01:16 +0000)]
Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495 am:
52e73d8ffb" into oc-dr1-dev-plus-aosp
am:
46ee248162
Change-Id: Icba43b904d1e48bacd771dc992c7c4ef46c80be0
Jorim Jaggi [Thu, 8 Jun 2017 01:13:49 +0000 (01:13 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495 am:
59fe02cf95
am:
0a94cc6eb0
Change-Id: I767f6b09e5c8b700dc3712f82add21f62ad5bf8b
Selim Cinek [Thu, 8 Jun 2017 01:11:39 +0000 (01:11 +0000)]
Merge "Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936 am:
334964899f" into oc-dr1-dev-plus-aosp
am:
06cc1610c6
Change-Id: Ie59e7e534932951ff466270cb30abebf683fb9cf
TreeHugger Robot [Thu, 8 Jun 2017 01:06:43 +0000 (01:06 +0000)]
Merge "resolve merge conflicts of
ce40da80701a to master"
Todd Kennedy [Thu, 8 Jun 2017 01:05:25 +0000 (01:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2
Shubang [Wed, 7 Jun 2017 20:23:12 +0000 (13:23 -0700)]
Add permission CHANGE_HDMI_CEC_ACTIVE_SOURCE
Test: mmm
Bug:
62270868
Change-Id: I7e8aad5324598ae2e2408d6ef6cb62d58d687d0e
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Mathieu Chartier [Thu, 8 Jun 2017 00:34:22 +0000 (17:34 -0700)]
Add system property for hot startup method threshold
The property is dalvik.vm.hot-startup-method-samples, setting this
controls how many startup samples are required before methods are
marked as hot in the profile.
Test: adb shell setprop dalvik.vm.hot-startup-method-samples 12
Test: adb shell setprop dalvik.vm.extra-opts -verbose:profiler
Test: adb logcat | grep Profile
Bug:
36457259
Change-Id: If8e37a160802a00fb44f0c243fb358df02104741
Jeff Sharkey [Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
Android Build Merger (Role) [Thu, 8 Jun 2017 00:10:59 +0000 (00:10 +0000)]
Merge "Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a am:
dacd9ed196" into oc-dr1-dev-plus-aosp
Ian Pedowitz [Thu, 8 Jun 2017 00:10:39 +0000 (00:10 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am:
695f21a661
Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Adrian Roos [Thu, 8 Jun 2017 00:08:30 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
dacd9ed196
Change-Id: I72b507987f85e2b17f8a98de72a61e64f7b980bd
Adrian Roos [Thu, 8 Jun 2017 00:08:22 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
b42e50a3a0
Change-Id: I1ca543cb1b23221adf96a7d09a152fea4461b8f5
Adrian Roos [Thu, 8 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:48:03 +0000 (23:48 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
am:
4317e457ba
Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
Android Build Merger (Role) [Wed, 7 Jun 2017 23:42:55 +0000 (23:42 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
cf8cfc4412" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
cf8cfc4412
Change-Id: Iceb7d0a6b88b3bf011e585ead483e924e1cc1b98
Android Build Merger (Role) [Wed, 7 Jun 2017 23:41:51 +0000 (23:41 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
50caf4af60" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 7 Jun 2017 23:40:32 +0000 (23:40 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
Bryce Lee [Wed, 7 Jun 2017 23:40:06 +0000 (23:40 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
50caf4af60
Change-Id: I46c77e2180b981e1d9e89b81d73e9f47a3519c55
Sundeep Ghuman [Wed, 7 Jun 2017 23:39:00 +0000 (23:39 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
8d4014995d
Change-Id: I26ab39fbc393a8fcf89c1daad50a8b02081c947a
Android Build Merger (Role) [Wed, 7 Jun 2017 23:36:20 +0000 (23:36 +0000)]
Merge "Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad am:
216f596cee" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Wed, 7 Jun 2017 23:35:32 +0000 (23:35 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
216f596cee
Change-Id: I99adff8d11f498a8f640689e6a472dc26a83ad04
Android Build Merger (Role) [Wed, 7 Jun 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours am:
788b2b9364 -s ours" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:52 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1
am:
8695bda38e -s ours
Change-Id: I5c9c69aab0789b8b741353936bd753ea491972c6
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:49 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours
am:
788b2b9364 -s ours
Change-Id: Id8c23e19ad74c5bac9097f4c123d385ff2503b60
Bryce Lee [Wed, 7 Jun 2017 23:31:48 +0000 (23:31 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
Sundeep Ghuman [Wed, 7 Jun 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1
Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
TreeHugger Robot [Wed, 7 Jun 2017 23:24:40 +0000 (23:24 +0000)]
Merge "Add dump function to dump car status bar information."
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1 -s ours
Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 23:09:37 +0000 (23:09 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
am:
ab67c300f3
Change-Id: I593cd3dd18eaf6a11f3eb961c0185150131772e6
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Selim Cinek [Wed, 7 Jun 2017 22:57:54 +0000 (22:57 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
Todd Kennedy [Tue, 6 Jun 2017 16:15:46 +0000 (09:15 -0700)]
Passing callingUid to internal methods
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.
Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes:
38349978
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
Fixed an issue where the icons had the wrong color
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes:
62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Sanket Padawe [Tue, 6 Jun 2017 22:12:04 +0000 (15:12 -0700)]
Update strings for modem restricted state.
(cherry picked from commit
c14c84c746cca6e63e6f115b5715d109e623344b)
Test: manual
Bug:
37377132
Change-Id: Iace44143623034c0255d7cceff839a4712972ee2
TreeHugger Robot [Wed, 7 Jun 2017 22:25:56 +0000 (22:25 +0000)]
Merge "Early exit if there are no spans affecting display"
Sanket Padawe [Wed, 7 Jun 2017 22:08:26 +0000 (22:08 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6ef238a51c
Change-Id: I89e7d1ca10ec3e9519e3afc92a40b3e0dfc4ac98
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Sanket Padawe [Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6acd6102c9
Change-Id: I8429e585c54f1336ba70311a012c019e30680fb8
Android Build Merger (Role) [Wed, 7 Jun 2017 21:58:48 +0000 (21:58 +0000)]
Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495 am:
52e73d8ffb" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Wed, 7 Jun 2017 21:57:52 +0000 (21:57 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
52e73d8ffb
Change-Id: Ic7db17b6e523db3360d57a686abb802975240fef
Jorim Jaggi [Wed, 7 Jun 2017 21:56:25 +0000 (21:56 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
59fe02cf95
Change-Id: If712fd817a0179f6437dce5d234990a28743fedf
Qiming Shi [Thu, 13 Apr 2017 08:23:18 +0000 (16:23 +0800)]
Add dump function to dump car status bar information.
Issue:
37295298
Test: adb shell dumpstate, no crashes
Change-Id: Id037e2f2af6bb2eb270442ecb741354d98269b6f
Signed-off-by: bxu10x <bingx.xu@intel.com>
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
Sanket Padawe [Wed, 7 Jun 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
Sanket Padawe [Wed, 7 Jun 2017 21:50:30 +0000 (21:50 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
Jorim Jaggi [Wed, 7 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
Jorim Jaggi [Wed, 7 Jun 2017 21:46:41 +0000 (21:46 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c
OSDN Git Service
