OSDN Git Service
Mickey Keeley [Wed, 30 May 2018 00:43:22 +0000 (17:43 -0700)]
BootParameters: Use proto for disk io.
Use proto for disk usage.
Bug:
79932027
Test: Ran through the following scenarios-
- RebootActivity parses previous boot parameters; sets next as expected.
- Push old parameters to device and ensured bootanimations reads it and
saves new format (serialized proto) that can be read in userspace
(RebootActivity).
- Unit tests pass.
Change-Id: I98aefb7a832c985d5061ee80ab85a4523f067641
Brad Ebinger [Fri, 8 Jun 2018 20:10:54 +0000 (13:10 -0700)]
[automerger skipped] Merge "Adds a private field to parceled data." am:
7db23752ab am:
1ff8f364d4 -s ours
am:
741d43b7bb -s ours
Change-Id: I142acf18a381fec5a5af7fba8b4fb6ee85c789aa
Brad Ebinger [Fri, 8 Jun 2018 19:50:15 +0000 (12:50 -0700)]
[automerger skipped] Merge "Unhide @SystemApi Constructor" am:
442b546e2a am:
a56e388a75 -s ours
am:
efa137b700 -s ours
Change-Id: Icd37a0835f52628322f7151db2a81042c1ca1c86
Brad Ebinger [Fri, 8 Jun 2018 19:45:30 +0000 (12:45 -0700)]
[automerger skipped] Merge "Adds a private field to parceled data." am:
7db23752ab
am:
1ff8f364d4 -s ours
Change-Id: Ia4112ec02579389e4fa02fabe7de493ee087124b
Brad Ebinger [Fri, 8 Jun 2018 19:38:09 +0000 (12:38 -0700)]
[automerger skipped] Merge "Unhide @SystemApi Constructor" am:
442b546e2a
am:
a56e388a75 -s ours
Change-Id: I3e60e7c533b78096800d5077c810483da747f1e6
Brad Ebinger [Fri, 8 Jun 2018 19:27:22 +0000 (12:27 -0700)]
Merge "Adds a private field to parceled data."
am:
7db23752ab
Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186
Brad Ebinger [Fri, 8 Jun 2018 19:21:11 +0000 (12:21 -0700)]
Merge "Unhide @SystemApi Constructor"
am:
442b546e2a
Change-Id: Ie6281283f6605b7125882698333644843838e2ef
TreeHugger Robot [Fri, 8 Jun 2018 18:10:41 +0000 (18:10 +0000)]
Merge "Removed IAutofillManager.updateOrRestartSession() logic."
Nan Zhang [Fri, 8 Jun 2018 17:52:34 +0000 (10:52 -0700)]
[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev am:
cb3dd2889c -s ours
am:
8ffbeb1877 -s ours
Change-Id: I3f3b422b208acb8b405647d3438b1f2af20a56e1
Felipe Leme [Fri, 8 Jun 2018 17:42:49 +0000 (10:42 -0700)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev am:
c5b828df68
am:
b779f34095
Change-Id: Ibc265123a5061fead1416c3a0a1027da3ce5f5bc
Nan Zhang [Fri, 8 Jun 2018 17:38:34 +0000 (10:38 -0700)]
[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
am:
cb3dd2889c -s ours
Change-Id: I667ac3fca83f1a4d8633903d877e7fe52765b6fd
Felipe Leme [Fri, 8 Jun 2018 17:32:02 +0000 (10:32 -0700)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
am:
c5b828df68
Change-Id: I54479da23ba82cccc4edd8eac1b3b27bc7942b93
Nan Zhang [Fri, 8 Jun 2018 17:28:37 +0000 (17:28 +0000)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 17:20:27 +0000 (17:20 +0000)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
Brad Ebinger [Fri, 8 Jun 2018 17:03:14 +0000 (17:03 +0000)]
Merge "Adds a private field to parceled data."
Brad Ebinger [Fri, 8 Jun 2018 17:02:48 +0000 (17:02 +0000)]
Merge "Unhide @SystemApi Constructor"
TreeHugger Robot [Fri, 8 Jun 2018 16:57:55 +0000 (16:57 +0000)]
Merge "Cleanup: Remove unused padding arguments"
David Brazdil [Fri, 8 Jun 2018 16:33:18 +0000 (09:33 -0700)]
Merge "Build dark greylist from public + light grey API" am:
60229832de am:
bd0dd0e59f
am:
4c67b9d449
Change-Id: I361df3b16524e7b0be0b48d8bc507caa233fd180
David Brazdil [Fri, 8 Jun 2018 16:20:59 +0000 (09:20 -0700)]
Merge "Build dark greylist from public + light grey API" am:
60229832de
am:
bd0dd0e59f
Change-Id: Icf43773b041d8058cd79da2b3f085f33f19f2078
David Brazdil [Fri, 8 Jun 2018 16:10:52 +0000 (09:10 -0700)]
Merge "Build dark greylist from public + light grey API"
am:
60229832de
Change-Id: I7a0077ed63f17e4a60482fad3f39ee1ab2d89461
David Brazdil [Fri, 8 Jun 2018 14:22:26 +0000 (14:22 +0000)]
Merge "Build dark greylist from public + light grey API"
Chalard Jean [Fri, 8 Jun 2018 13:20:22 +0000 (06:20 -0700)]
Merge "Opportunistic typo fix" am:
6b03498a54 am:
99cf81acac
am:
5d2bab8f63
Change-Id: Ic890e82fec41fed6dadb88c84b6aa7677a2e003b
Chalard Jean [Fri, 8 Jun 2018 13:08:56 +0000 (06:08 -0700)]
Merge "Opportunistic typo fix" am:
6b03498a54
am:
99cf81acac
Change-Id: Ie1909cb93fa6ed28e8d43a6a3849f5b4d8eec861
Mihai Popa [Fri, 8 Jun 2018 13:08:00 +0000 (13:08 +0000)]
Merge "[Magnifier-44] Fix memory leak caused by callback"
Chalard Jean [Fri, 8 Jun 2018 13:01:27 +0000 (06:01 -0700)]
Merge "Opportunistic typo fix"
am:
6b03498a54
Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
Tiger Huang [Fri, 8 Jun 2018 12:02:36 +0000 (12:02 +0000)]
Merge "Remove redundant logic about showing navigation bar"
Treehugger Robot [Fri, 8 Jun 2018 11:51:29 +0000 (11:51 +0000)]
Merge "Opportunistic typo fix"
Mihai Popa [Wed, 6 Jun 2018 13:30:54 +0000 (14:30 +0100)]
[Magnifier-44] Fix memory leak caused by callback
Before this CL, the magnifier could have caused a memory leak when:
- in Editor we give the magnifier a callback that updates the visibility
of the handles after the magnifier is drawn. This holds a reference to
the HandleView, which in turn has a reference to the containing Activity
- the callback is set on the InternalPopupWindow, in order to be run
after the next #doDraw call
- #doDraw is post'd as a runnable to the UI thread
- the magnifier is dismissed and the activity is destroyed
- when the garbage collection happens, the InternalPopupWindow cannot be
collected, because either:
-- there is still a reference to the job expected to run #doDraw
-- there is still a pixel copy that has to finish. We keep a reference
to the InternalPopupWindow in use when the pixel copy was requested
in order to compare it with the current one, and dismiss the pixel
copy result if the instance has changed
- both options above mean that we will still have a reference to the
callback that sets the visibility of the handles, so a reference to the
containing Activity. The Activity is, therefore, leaked.
This CL cleares the handle visibility callback when the magnifier is
dismissed, such that the unnecessary reference to the Activity will not
be held.
Bug:
80279783
Test: verified with leakcanary that the memory leak no longer exists
Change-Id: I65c77eb12d2778c76fe631b55e6a7164fbf487f1
Wei Sheng Shih [Fri, 8 Jun 2018 09:03:59 +0000 (09:03 +0000)]
Merge "Fix test case failed at DocumentsProviderTest#testFindDocumentPath_treeUri_throwsOnNonChildDocument."
Chris Forbes [Fri, 8 Jun 2018 06:36:25 +0000 (23:36 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev am:
551328eaaa
am:
27213a3120
Change-Id: I1540f12409051323dc1540b87b61e1cc431d676c
Svet Ganov [Fri, 8 Jun 2018 06:19:40 +0000 (23:19 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev am:
e7bd4e7e8f
am:
cbd47f7937
Change-Id: Ia58918ec4c66f9263ad7d0e27e74ae1b87402ba4
Android Build Merger (Role) [Fri, 8 Jun 2018 05:53:30 +0000 (05:53 +0000)]
Merge "[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am:
1b9de57f38 am:
fe96bd9c72 -s ours am:
e5c4aac7e5"
Tony Huang [Fri, 8 Jun 2018 05:52:59 +0000 (05:52 +0000)]
Merge "Fix Night Light only display 12-hr time format on secondary label"
Eric Laurent [Fri, 8 Jun 2018 05:52:49 +0000 (22:52 -0700)]
[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am:
1b9de57f38 am:
fe96bd9c72 -s ours
am:
e5c4aac7e5
Change-Id: I42294f136f4203a89cc1fcd709d346002607ba6c
Adam Powell [Fri, 8 Jun 2018 05:46:47 +0000 (22:46 -0700)]
Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am:
eaf3590eda" into pi-dev-plus-aosp
am:
6947fbbdd0
Change-Id: I791021aa5de1c3bf1e256c0d26c442e21c13c5ed
Mathieu Chartier [Fri, 8 Jun 2018 05:35:42 +0000 (22:35 -0700)]
Merge "Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb am:
202e61f127" into pi-dev-plus-aosp
am:
80c239c46a
Change-Id: I2bd2dc88aaa6f72e788e06eee1fe24a971c32ba0
Chris Forbes [Fri, 8 Jun 2018 05:23:29 +0000 (22:23 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
am:
551328eaaa
Change-Id: I4f9a420dcefb53e767a745f595787b71fcacd228
Chris Forbes [Fri, 8 Jun 2018 05:14:12 +0000 (05:14 +0000)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 05:12:45 +0000 (22:12 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev
am:
e7bd4e7e8f
Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345
Lucas Dupin [Fri, 8 Jun 2018 05:07:46 +0000 (22:07 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev am:
c28e772042
am:
1d580b825a
Change-Id: I75d49473d441579d58c4f2fa322c8e2d83e64ae7
TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]
Merge "Don't access keyguard from instant apps." into pi-dev
Eric Laurent [Fri, 8 Jun 2018 04:43:53 +0000 (21:43 -0700)]
[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am:
1b9de57f38
am:
fe96bd9c72 -s ours
Change-Id: Ife1a1762bba30d0a24919498c8b5c06b5639ac92
TreeHugger Robot [Fri, 8 Jun 2018 04:33:50 +0000 (04:33 +0000)]
Merge "More conservative dark text calculation"
TreeHugger Robot [Fri, 8 Jun 2018 04:23:30 +0000 (04:23 +0000)]
Merge "Log SIM state changes"
Android Build Merger (Role) [Fri, 8 Jun 2018 04:19:01 +0000 (04:19 +0000)]
Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am:
eaf3590eda" into pi-dev-plus-aosp
Adam Powell [Fri, 8 Jun 2018 04:18:10 +0000 (21:18 -0700)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am:
eaf3590eda
Change-Id: I569a2caf105c4b6cf60b81026567ef4af7ca31c9
Android Build Merger (Role) [Fri, 8 Jun 2018 04:15:24 +0000 (04:15 +0000)]
Merge "Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb am:
202e61f127" into pi-dev-plus-aosp
Mathieu Chartier [Fri, 8 Jun 2018 04:14:59 +0000 (21:14 -0700)]
Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb
am:
202e61f127
Change-Id: Id4967cc4eb918ef81be118d6c03707b4e4e1983e
Lucas Dupin [Fri, 8 Jun 2018 04:10:12 +0000 (21:10 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev
am:
c28e772042
Change-Id: I24a01e8e9ea9d82275a7434fc8dfdc5d1f4a30ad
TreeHugger Robot [Fri, 8 Jun 2018 04:00:23 +0000 (04:00 +0000)]
Merge "Fix the order of permissions in CapPortal Manifest"
TreeHugger Robot [Fri, 8 Jun 2018 03:48:21 +0000 (03:48 +0000)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]
Merge "Animate owner info during wake-up transition" into pi-dev
Svetoslav Ganov [Fri, 8 Jun 2018 03:30:54 +0000 (20:30 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev am:
97995da6e1
am:
a2c978b550
Change-Id: I14e1b75b1c60550e75c0590e7e50e8c2417346d5
Svet Ganov [Fri, 8 Jun 2018 03:20:34 +0000 (20:20 -0700)]
Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases
bug:
109652548
Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
Svetoslav Ganov [Fri, 8 Jun 2018 03:15:54 +0000 (20:15 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
am:
97995da6e1
Change-Id: I014e8de99a78a489f1f32738429d1cb0cebc4076
Eric Laurent [Fri, 8 Jun 2018 03:10:14 +0000 (20:10 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)"
am:
1b9de57f38
Change-Id: I128bf69bfdd9efaaf186ed3b9278d7ef1479b19e
Benjamin Miller [Fri, 8 Jun 2018 03:09:06 +0000 (20:09 -0700)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev am:
0f5f09844d
am:
aaec389c2e
Change-Id: I87f72add1a531048c94b31e4050887476257db1e
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
Lin Guo [Fri, 8 Jun 2018 02:56:50 +0000 (19:56 -0700)]
Merge changes from topic "volume-change-flags" into pi-dev am:
a88cf78009
am:
ab6758a0a4
Change-Id: Ie1e295aceeb8d594e5ed1e7563c834dd07cdafd2
Benjamin Miller [Fri, 8 Jun 2018 02:32:53 +0000 (19:32 -0700)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
am:
0f5f09844d
Change-Id: I6c19f03debc6d15eece445dfd7fb0f5336d90407
Mathieu Chartier [Fri, 8 Jun 2018 02:32:39 +0000 (19:32 -0700)]
Merge "Add filter for NoPreloadHolders"
am:
88ee5c93bb
Change-Id: I4e6b539a4fabf1584673100e48146f22a929f3b3
TreeHugger Robot [Fri, 8 Jun 2018 02:27:26 +0000 (02:27 +0000)]
Merge "Set AppStandbyController charging state on init"
TreeHugger Robot [Fri, 8 Jun 2018 02:24:22 +0000 (02:24 +0000)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
Anarghya Mitra [Fri, 8 Jun 2018 02:24:09 +0000 (19:24 -0700)]
Change Quick Settings to account for branded VPNs. am:
10422896ed
am:
9a91f277a7
Change-Id: I9d4c738b54ce7487b5a8214c30d6659c41b9418a
Lin Guo [Fri, 8 Jun 2018 02:12:25 +0000 (19:12 -0700)]
Merge changes from topic "volume-change-flags" into pi-dev
am:
a88cf78009
Change-Id: Idbcaa08b7255c8d2dfd7d2bae42fe1daf3c12bf8
Yu-Han Yang [Fri, 8 Jun 2018 02:10:48 +0000 (19:10 -0700)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev am:
a364b3111a
am:
e25d61f1bc
Change-Id: I9d43b4d26c98300ebdbf86a78eed0e22cae300d4
Treehugger Robot [Fri, 8 Jun 2018 02:06:17 +0000 (02:06 +0000)]
Merge "Add field to set A2DP device volume on connect (1/2)"
Anthony Chen [Fri, 8 Jun 2018 01:58:28 +0000 (18:58 -0700)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev am:
a0d475a43f
am:
4d4b5b6810
Change-Id: I29d9ee5ce0de960c832386c1443c33acb424c55c
TreeHugger Robot [Fri, 8 Jun 2018 01:58:10 +0000 (01:58 +0000)]
Merge changes from topic "volume-change-flags" into pi-dev
* changes:
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Comply with the volume callback change
Jorim Jaggi [Fri, 8 Jun 2018 01:35:46 +0000 (18:35 -0700)]
Merge "Move nulling of nextFrameCallback" into pi-dev am:
e4e9ee7951
am:
981b2b1311
Change-Id: Ie600840052e1fcaae07b2abfaaa8715ee60ddd13
Michael Wachenschwanz [Fri, 8 Jun 2018 01:29:52 +0000 (18:29 -0700)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev am:
f55cce3008
am:
9a971828e6
Change-Id: Ic3aeec86f57a45e9da59e432a04a1e06f75fe510
Aarthi Balachander [Fri, 8 Jun 2018 01:18:32 +0000 (18:18 -0700)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev am:
36fc3b1a53
am:
04eb291350
Change-Id: Ic057bd31672128c6a5028b2663f14814efde5384
Yin-Chia Yeh [Fri, 8 Jun 2018 01:09:05 +0000 (18:09 -0700)]
[automerger skipped] Merge "Camera: update tonemap image in html doc" into pi-dev am:
beb11a582a
am:
c5f794932f -s ours
Change-Id: I69118109af58ba6aa054f0f22be70070952212d7
Anarghya Mitra [Fri, 8 Jun 2018 01:05:07 +0000 (18:05 -0700)]
Change Quick Settings to account for branded VPNs.
am:
10422896ed
Change-Id: If9b181b5d4175f9418b4c8b0e4a8938b0bc98811
Jaewan Kim [Fri, 8 Jun 2018 01:01:29 +0000 (18:01 -0700)]
Merge "MediaSessionService: Fix NPE" into pi-dev am:
2aac6195e6
am:
b0f40861c9
Change-Id: I5f3ee69673f9fcf1752306b1d2c3c2f79a4330f3
Yu-Han Yang [Fri, 8 Jun 2018 00:46:39 +0000 (17:46 -0700)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
am:
a364b3111a
Change-Id: I4ee77d8ae3417e76c330486205320077b23ea941
Anthony Chen [Fri, 8 Jun 2018 00:24:42 +0000 (17:24 -0700)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
am:
a0d475a43f
Change-Id: I603568a7168fb3b8a4a946d937b754f13b3d917c
Jorim Jaggi [Fri, 8 Jun 2018 00:16:11 +0000 (17:16 -0700)]
Merge "Move nulling of nextFrameCallback" into pi-dev
am:
e4e9ee7951
Change-Id: If988240d948266118a9441ee356ff384b4ff53b5
Lin Guo [Fri, 8 Jun 2018 00:08:30 +0000 (17:08 -0700)]
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Bug:
109841417
Test: manual
Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b
Anarghya Mitra [Thu, 7 Jun 2018 20:26:14 +0000 (13:26 -0700)]
Change Quick Settings to account for branded VPNs.
Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug:
109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54
Yu-Han Yang [Thu, 7 Jun 2018 23:50:08 +0000 (23:50 +0000)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Chris Forbes [Thu, 7 Jun 2018 23:41:19 +0000 (16:41 -0700)]
pm: Exposing Vulkan 1.1 does not guarantee AHB extension support
Bug: b/
109875843
Change-Id: Ib53fb1a4f7a5a6c055b575b4d8775f8bd62db7a8
Lucas Dupin [Thu, 7 Jun 2018 20:59:42 +0000 (13:59 -0700)]
More conservative dark text calculation
Refactored WallpaperColors to use constrast ratio instead of luminance
for detecting dark pixels. Also using a contrast more conservative than
what GAR requires while decreasing the dark area threshold.
Change-Id: I67b799be4b7ccd50bb3e63c6179d513b9b76446b
Fixes:
76435920
Test: manually set various wallpapers
Test: use new debug flag to verify which pixel is actually dark
Svetoslav Ganov [Thu, 7 Jun 2018 23:23:39 +0000 (23:23 +0000)]
Revert "Allow instant apps to send broadcasts to themselves"
This reverts commit
7b40358fa316038ce6a3243b8706c6f5b7a49536.
Reason for revert: False positive - this works and patch not needed.
bug:
109583877
Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f
Mathieu Chartier [Thu, 7 Jun 2018 23:27:12 +0000 (23:27 +0000)]
Merge "Add filter for NoPreloadHolders"
Michael Wachenschwanz [Thu, 7 Jun 2018 23:05:25 +0000 (16:05 -0700)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
am:
f55cce3008
Change-Id: I13c1b629e2531be9d01a07011ccc3a27700dde8b
Aarthi Balachander [Thu, 7 Jun 2018 22:59:53 +0000 (15:59 -0700)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
am:
36fc3b1a53
Change-Id: I9d4fd38bdfa3c605583436cda9f331148113d551
Yao Chen [Thu, 7 Jun 2018 22:50:46 +0000 (15:50 -0700)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev am:
38b92986df
am:
39c8fe12e4
Change-Id: Ie27a0d43da9fa0eb0c751cafa3f04220a5f8f18a
Hongwei Wang [Thu, 7 Jun 2018 19:35:08 +0000 (12:35 -0700)]
Comply with the volume callback change
Bug:
109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56
Eric Laurent [Mon, 21 May 2018 16:28:46 +0000 (09:28 -0700)]
Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.
Bug:
79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72
(cherry picked from commit
3e6fb6309033c50081c0789b5905d5cd539b38f6)
Yin-Chia Yeh [Thu, 7 Jun 2018 22:28:19 +0000 (15:28 -0700)]
Merge "Camera: update tonemap image in html doc" into pi-dev
am:
beb11a582a
Change-Id: Id2471de89e2d44ae9deaa31144d96218d84ea34b
TreeHugger Robot [Thu, 7 Jun 2018 22:23:12 +0000 (22:23 +0000)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
Jaewan Kim [Thu, 7 Jun 2018 22:21:20 +0000 (15:21 -0700)]
Merge "MediaSessionService: Fix NPE" into pi-dev
am:
2aac6195e6
Change-Id: I5118601600aeac9ac464e5922524aa4f8261bc70
TreeHugger Robot [Thu, 7 Jun 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Move nulling of nextFrameCallback" into pi-dev
Yao Chen [Thu, 7 Jun 2018 21:53:43 +0000 (14:53 -0700)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
am:
38b92986df
Change-Id: Ia90bed14900a2c944165aefe00661d3979c08aed
Android Build Merger (Role) [Thu, 7 Jun 2018 21:52:50 +0000 (21:52 +0000)]
Merge "Merge "Hide backdrop when waking up from fp" into pi-dev am:
e752b75dad am:
8c24406355"
Lucas Dupin [Thu, 7 Jun 2018 21:52:25 +0000 (14:52 -0700)]
Merge "Hide backdrop when waking up from fp" into pi-dev am:
e752b75dad
am:
8c24406355
Change-Id: Ic144a730f854113deacf7552947166030adf5856
Fan Zhang [Thu, 7 Jun 2018 21:50:04 +0000 (21:50 +0000)]
Merge "Fix Robolectric tests"
shawnlin [Thu, 7 Jun 2018 21:45:56 +0000 (14:45 -0700)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev am:
0631de5772
am:
07ce67ecdf
Change-Id: Ie15f57d6905c6827a4806368c1f1e78b45c8209e
TreeHugger Robot [Thu, 7 Jun 2018 21:43:50 +0000 (21:43 +0000)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
OSDN Git Service
