OSDN Git Service
Todd Kennedy [Thu, 8 Jun 2017 06:28:33 +0000 (06:28 +0000)]
Merge "Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978 am:
de066fd249" into oc-dr1-dev-plus-aosp
am:
56f83527ae
Change-Id: I06d1dec5693658716d7ade11b93a1ae419111594
Adam Bookatz [Thu, 8 Jun 2017 06:26:13 +0000 (06:26 +0000)]
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4 am:
300ebee8c4" into oc-dr1-dev-plus-aosp
am:
36e8ee9c1f
Change-Id: I2a6635ee9f53510661e9f15e32b3959bbd440aae
Todd Kennedy [Thu, 8 Jun 2017 06:23:51 +0000 (06:23 +0000)]
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96 am:
4d2a9a9f50" into oc-dr1-dev-plus-aosp
am:
ed07898d13
Change-Id: I468d43c265ab002ccabd3f33f8375d81f17ac66e
Phil Weaver [Thu, 8 Jun 2017 06:21:17 +0000 (06:21 +0000)]
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509 am:
3d5bf99e7f" into oc-dr1-dev-plus-aosp
am:
fc7d48e703
Change-Id: I63ed1c2aa9174155cf472112bfc2f96d2c5116aa
Hall Liu [Thu, 8 Jun 2017 06:18:18 +0000 (06:18 +0000)]
Merge "Merge "Embms download setup" am:
da5b77fa9b am:
a807ee8f1c am:
b6a16546b5" into oc-dr1-dev-plus-aosp
am:
6e1e2090af
Change-Id: I248ae9690eebd6bd948b736fdca295f3c2f06309
Jeff Sharkey [Thu, 8 Jun 2017 06:15:50 +0000 (06:15 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
13e4dfdceb" into oc-dr1-dev-plus-aosp
am:
e6d4e7ddb4
Change-Id: I71526da73c0dcb36ec76be4672d554bf4ff23247
Andreas Gampe [Thu, 8 Jun 2017 06:12:48 +0000 (06:12 +0000)]
Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am:
837f1167ca" into oc-dr1-dev-plus-aosp
am:
a985db2fb7
Change-Id: I1b368170aa7d7cf17c4294766d721026ae538db5
Sudheer Shanka [Thu, 8 Jun 2017 06:10:35 +0000 (06:10 +0000)]
Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e am:
2bb4966dab" into oc-dr1-dev-plus-aosp
am:
a8ae3296e2
Change-Id: Ie7de0b2c54cacef7db683b053fe1c9ad222f26ee
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
Android Build Merger (Role) [Thu, 8 Jun 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978 am:
de066fd249" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 06:02:07 +0000 (06:02 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
de066fd249
Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803
Android Build Merger (Role) [Thu, 8 Jun 2017 06:01:36 +0000 (06:01 +0000)]
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4 am:
300ebee8c4" into oc-dr1-dev-plus-aosp
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
Adam Bookatz [Thu, 8 Jun 2017 06:00:42 +0000 (06:00 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4
am:
300ebee8c4
Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e
Android Build Merger (Role) [Thu, 8 Jun 2017 06:00:13 +0000 (06:00 +0000)]
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96 am:
4d2a9a9f50" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 05:59:13 +0000 (05:59 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96
am:
4d2a9a9f50
Change-Id: Idceec36ea86ae6b00adb3ee24bbb08c3116403ce
Android Build Merger (Role) [Thu, 8 Jun 2017 05:58:47 +0000 (05:58 +0000)]
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509 am:
3d5bf99e7f" into oc-dr1-dev-plus-aosp
Phil Weaver [Thu, 8 Jun 2017 05:57:56 +0000 (05:57 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509
am:
3d5bf99e7f
Change-Id: I7649712f41a7746acd21382e651e45fecf67a0cf
Android Build Merger (Role) [Thu, 8 Jun 2017 05:57:26 +0000 (05:57 +0000)]
Merge "Merge "Embms download setup" am:
da5b77fa9b am:
a807ee8f1c am:
b6a16546b5" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 05:56:24 +0000 (05:56 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
13e4dfdceb" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 8 Jun 2017 05:55:56 +0000 (05:55 +0000)]
Merge "Embms download setup" am:
da5b77fa9b am:
a807ee8f1c
am:
b6a16546b5
Change-Id: I70d37518b24034a1e133bf6e9248feb64d439e6a
Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:28 +0000 (05:55 +0000)]
Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am:
837f1167ca" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 05:55:32 +0000 (05:55 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504
am:
13e4dfdceb
Change-Id: Id489b5ef70eb94b487d5cd913712594f8ca0b723
Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:03 +0000 (05:55 +0000)]
Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e am:
2bb4966dab" into oc-dr1-dev-plus-aosp
Andreas Gampe [Thu, 8 Jun 2017 05:54:32 +0000 (05:54 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am:
837f1167ca
Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
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
Sudheer Shanka [Thu, 8 Jun 2017 05:53:00 +0000 (05:53 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e
am:
2bb4966dab
Change-Id: Ib163b6a910f8206a6cc1767608fbbbac85bfd53f
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
Todd Kennedy [Thu, 8 Jun 2017 05:50:03 +0000 (05:50 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
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
Jeff Sharkey [Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
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
Sudheer Shanka [Thu, 8 Jun 2017 05:44:49 +0000 (05:44 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
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
Adam Bookatz [Thu, 8 Jun 2017 02:48:32 +0000 (02:48 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: I67da5b543fc839031d3d2544f3723b730edaa1a8
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
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
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"
Todd Kennedy [Thu, 8 Jun 2017 01:49:03 +0000 (01:49 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I6ed4a41dbd9af3a97b774e7d2854fea1c66cc582
Phil Weaver [Thu, 8 Jun 2017 01:45:56 +0000 (01:45 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
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:40:03 +0000 (01:40 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
Phil Weaver [Thu, 8 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
Hall Liu [Thu, 8 Jun 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Embms download setup" am:
da5b77fa9b
am:
a807ee8f1c
Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
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
Hall Liu [Thu, 8 Jun 2017 01:26:28 +0000 (01:26 +0000)]
Merge "Embms download setup"
am:
da5b77fa9b
Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
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
Hall Liu [Thu, 8 Jun 2017 01:20:48 +0000 (01:20 +0000)]
Merge "Embms download setup"
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:08:20 +0000 (01:08 +0000)]
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
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
OSDN Git Service
