OSDN Git Service
Winston Man [Thu, 17 Aug 2017 18:11:36 +0000 (18:11 +0000)]
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev
am:
70b438cadf
Change-Id: I288eaa026b8a2e4c11e67a8e00a78b6dd60914b6
TreeHugger Robot [Thu, 17 Aug 2017 18:00:03 +0000 (18:00 +0000)]
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev
Sudheer Shanka [Thu, 17 Aug 2017 17:40:22 +0000 (17:40 +0000)]
Merge "Update standby firewall rules when an app came out of standby mode." into oc-mr1-dev
am:
f523c630e4
Change-Id: I1115d6ea49dcc8903f5e058469d53524679c2263
Bryce Lee [Thu, 17 Aug 2017 17:36:03 +0000 (17:36 +0000)]
Merge "Add back support for force resize developer option." into oc-mr1-dev
am:
23b7a8ad8b
Change-Id: Ie167ce8ad4b6efddaa16eb0abca41ee3520229c6
Michael Wright [Thu, 17 Aug 2017 17:28:26 +0000 (17:28 +0000)]
Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev
am:
9010bfb05e
Change-Id: I69e471df7a9f5eb061d44b51981dfb91a2d0a8bb
Dianne Hackborn [Thu, 17 Aug 2017 17:22:03 +0000 (17:22 +0000)]
Merge "Small fix to pm dumpsys formatting." into oc-mr1-dev
am:
2d80887e19
Change-Id: I015ef7ec82bd65994b226f3d3433278dbc2ad5f1
Sudheer Shanka [Thu, 17 Aug 2017 17:12:05 +0000 (17:12 +0000)]
Merge "Update standby firewall rules when an app came out of standby mode." into oc-mr1-dev
Bryce Lee [Thu, 17 Aug 2017 17:11:52 +0000 (17:11 +0000)]
Merge "Add back support for force resize developer option." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:09:13 +0000 (17:09 +0000)]
Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:08:33 +0000 (17:08 +0000)]
Merge "Small fix to pm dumpsys formatting." into oc-mr1-dev
Hall Liu [Thu, 17 Aug 2017 16:27:04 +0000 (16:27 +0000)]
Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev
am:
d33be52592
Change-Id: I9fe75eee8b3aaf8d96de20dfffbff2a0ad7e6508
Hall Liu [Thu, 17 Aug 2017 16:17:53 +0000 (16:17 +0000)]
Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev
Felipe Leme [Thu, 17 Aug 2017 16:10:57 +0000 (16:10 +0000)]
Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev
am:
fac2141f4e
Change-Id: Ib89a4888b3776dd6eb2ff3754c027b2ec54e4c56
TreeHugger Robot [Thu, 17 Aug 2017 16:02:54 +0000 (16:02 +0000)]
Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev
Julia Reynolds [Thu, 17 Aug 2017 16:01:30 +0000 (16:01 +0000)]
Merge changes I36636687,I4c45f787 into oc-mr1-dev
am:
54ff7e7582
Change-Id: I6f368c79acfc92c4ed62e7808ae5c744959069c7
TreeHugger Robot [Thu, 17 Aug 2017 15:54:52 +0000 (15:54 +0000)]
Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
Doc updates
Translate default channel on locale change
Daniel Sandler [Thu, 17 Aug 2017 14:37:54 +0000 (14:37 +0000)]
Merge changes from topic "revert-injectors" into oc-mr1-dev
am:
d33fe05c66
Change-Id: I7e66180252232f22e23e68b8aec7eedbd2bed82b
Daniel Sandler [Thu, 17 Aug 2017 14:32:40 +0000 (14:32 +0000)]
Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
Revert "Add API to allow apps more control over instantiation"
Revert "Add plugin to swap out recents"
Lorenzo Colitti [Thu, 17 Aug 2017 09:14:27 +0000 (09:14 +0000)]
Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev
am:
c3e7f875b4
Change-Id: I026e6aa9e7b371f316c0d97c3cf5e78abc1f5263
TreeHugger Robot [Thu, 17 Aug 2017 09:06:57 +0000 (09:06 +0000)]
Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev
Charles He [Thu, 17 Aug 2017 08:01:53 +0000 (08:01 +0000)]
Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
am:
8b2513e439
Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e
Charles He [Thu, 17 Aug 2017 07:54:05 +0000 (07:54 +0000)]
Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
Lorenzo Colitti [Tue, 15 Aug 2017 10:25:51 +0000 (19:25 +0900)]
Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I0304e555544ee18c83244672766c767cbad650a1
Android Build Merger (Role) [Thu, 17 Aug 2017 06:15:25 +0000 (06:15 +0000)]
Merge "Maps crashed entering PIP right after... am:
598c497be3 -s ours am:
1ee0381c7e -s ours" into oc-mr1-dev-plus-aosp
Dianne Hackborn [Thu, 17 Aug 2017 06:11:09 +0000 (06:11 +0000)]
Maps crashed entering PIP right after... am:
598c497be3 -s ours
am:
1ee0381c7e -s ours
Change-Id: I0e3490c463a4a29346d2ebbcaa3734da6cc74fdf
Dianne Hackborn [Thu, 17 Aug 2017 06:08:51 +0000 (06:08 +0000)]
Maps crashed entering PIP right after... am:
598c497be3
am:
d4a5b56c41 -s ours
Change-Id: I16abfd720e4268f73d0205e40013f386d98a05d2
Dianne Hackborn [Thu, 17 Aug 2017 05:58:50 +0000 (05:58 +0000)]
Maps crashed entering PIP right after...
am:
598c497be3
Change-Id: I724ffe7d4b41cbd83a10bef4c78fa461633972e2
Dianne Hackborn [Thu, 17 Aug 2017 05:58:47 +0000 (05:58 +0000)]
Maps crashed entering PIP right after...
am:
598c497be3 -s ours
Change-Id: Id0998230a13bd257c54b078e9d4ba42943a42db0
Dianne Hackborn [Mon, 31 Jul 2017 20:56:02 +0000 (13:56 -0700)]
Maps crashed entering PIP right after...
...beginning navigation
Bug:
64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit
52195a66311d79a2f57e8112db86d48ed15bf915)
Sudheer Shanka [Thu, 17 Aug 2017 04:55:27 +0000 (04:55 +0000)]
Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev
am:
1c18b56520
Change-Id: I44f7b53de322b558f7319473d388aba5ab340633
Sudheer Shanka [Thu, 17 Aug 2017 04:49:04 +0000 (04:49 +0000)]
Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev
Android Build Merger (Role) [Thu, 17 Aug 2017 03:33:37 +0000 (03:33 +0000)]
Merge "Merge "Add new "fast" filter for ambient light." into oc-dr1-dev am:
c6349f3943 am:
551e5a7bb2" into oc-mr1-dev-plus-aosp
Vineeta Srivastava [Thu, 17 Aug 2017 03:27:32 +0000 (03:27 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev am:
c6349f3943
am:
551e5a7bb2
Change-Id: Ib97808fef977476e4d73ffa771b22612079125f7
Vineeta Srivastava [Thu, 17 Aug 2017 03:25:00 +0000 (03:25 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev am:
c6349f3943
am:
acc598f7b4
Change-Id: Ia34c02bce78f50baf2e2d0bee0c4d27dad2313ad
Vineeta Srivastava [Thu, 17 Aug 2017 03:17:12 +0000 (03:17 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
am:
c6349f3943
Change-Id: Ief4db995648882e480719941680f55012208a0ff
Felipe Leme [Thu, 17 Aug 2017 03:17:03 +0000 (03:17 +0000)]
Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev
am:
10d176009d
Change-Id: Iee9b9acf091628992d3ceecb902695d291858438
Vineeta Srivastava [Thu, 17 Aug 2017 03:15:32 +0000 (03:15 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
am:
c6349f3943
Change-Id: I85a0971fe3c33f533a1758e8b604b7b1ade2b470
Vineeta Srivastava [Thu, 17 Aug 2017 03:07:47 +0000 (03:07 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
Android Build Merger (Role) [Thu, 17 Aug 2017 03:07:28 +0000 (03:07 +0000)]
Merge "Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev am:
f2a70fc116" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 17 Aug 2017 03:07:02 +0000 (03:07 +0000)]
Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev
Jeff Davidson [Thu, 17 Aug 2017 03:02:42 +0000 (03:02 +0000)]
Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
am:
f2a70fc116
Change-Id: Ib50f88db345783ac735885880daec890efd31b76
Svetoslav Ganov [Thu, 17 Aug 2017 02:59:36 +0000 (02:59 +0000)]
Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69 am:
da4e8f2d31" into oc-dr1-dev-plus-aosp
am:
9706d8000b -s ours
Change-Id: I5f3cd8aa863c90532383b6615bbc3bc731323582
Android Build Merger (Role) [Thu, 17 Aug 2017 02:56:01 +0000 (02:56 +0000)]
Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69 am:
2800f22eec am:
ec5dcff9cd -s ours" into oc-mr1-dev-plus-aosp
Jeff Davidson [Thu, 17 Aug 2017 02:53:43 +0000 (02:53 +0000)]
Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
Svetoslav Ganov [Thu, 17 Aug 2017 02:52:45 +0000 (02:52 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69 am:
2800f22eec
am:
ec5dcff9cd -s ours
Change-Id: I9aeebf5ad18409fb038a21e24fde45f588d260f8
Android Build Merger (Role) [Thu, 17 Aug 2017 02:51:27 +0000 (02:51 +0000)]
Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69 am:
da4e8f2d31" into oc-dr1-dev-plus-aosp
Svetoslav Ganov [Thu, 17 Aug 2017 02:51:08 +0000 (02:51 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69 am:
2800f22eec -s ours
am:
a41e7b87dc -s ours
Change-Id: I40bfeb479cdde89fbbbcca3d72a2d69bdddf7f0f
Svetoslav Ganov [Thu, 17 Aug 2017 02:44:20 +0000 (02:44 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69
am:
2800f22eec
Change-Id: I85fdc058077fa77179e4a5e019cb8368038ee717
Svetoslav Ganov [Thu, 17 Aug 2017 02:44:09 +0000 (02:44 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69
am:
da4e8f2d31
Change-Id: I3c222a78d6993326b1d96fec8b1f73836dc81985
Svetoslav Ganov [Thu, 17 Aug 2017 02:44:01 +0000 (02:44 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69
am:
2800f22eec -s ours
Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328
Svetoslav Ganov [Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am:
357f42bf69
Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa
Svetoslav Ganov [Thu, 17 Aug 2017 02:34:33 +0000 (02:34 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am:
357f42bf69
Change-Id: Id53e35da42506eef81e628b855dc731b5e590d21
TreeHugger Robot [Thu, 17 Aug 2017 02:29:21 +0000 (02:29 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
Svetoslav Ganov [Wed, 16 Aug 2017 21:50:00 +0000 (14:50 -0700)]
Properly compute default and system set flag on an upgrade
We added the notions of a default value and whether this default is set
by the system for a setting which is needed for experiments since in
case a bad value is pushed we should be able to incrementally rollback
to a stable state. If a system component sets a setting value this
automatically becomes the default. System components are the platform
package, the special UIDs (telephony, etc), apps singed with the
platform cert, system installed persistent apps, and SUW.
In N we did not have the notion of a default and during an upgrade need
to adjust the default and whether this default is set by the system.
This migration runs as the system UID and was incorrectly computing that
the package that changed the settings last was a part of the system and
setting the current value as its default set by the system. This
resulted in taking more storage space as we also count the default which
led the package which changed the setting to go over the quota and that
throws. If the first caller into the settings provider is the system
main
thread (almost certain) we end up throwing an exception on the system
main thread - crashing the system server.
Test: flash N, install an app abusing sys settings, update to O
Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
bug:
64718888
Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
Sudheer Shanka [Sat, 12 Aug 2017 01:22:16 +0000 (18:22 -0700)]
Fix and enable ConnOnActivityStartTest.
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
initialization.
Bug:
38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Merged-In: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Android Build Merger (Role) [Thu, 17 Aug 2017 02:10:21 +0000 (02:10 +0000)]
Merge "Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev am:
6033ab604f" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 17 Aug 2017 02:05:39 +0000 (02:05 +0000)]
Merge "Merge "Revert "Fix lint errors in the streaming API"" am:
42d3eadb37 am:
cb63a47d41 am:
c7ac478f51 am:
e2f5f4b110" into oc-mr1-dev-plus-aosp
Michael Wright [Thu, 17 Aug 2017 02:05:25 +0000 (02:05 +0000)]
Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev
am:
6033ab604f
Change-Id: Iaeceffc39a96bd499f807bb32747b7865c95be3a
Hall Liu [Thu, 17 Aug 2017 02:01:40 +0000 (02:01 +0000)]
Merge "Revert "Fix lint errors in the streaming API"" am:
42d3eadb37 am:
cb63a47d41 am:
c7ac478f51
am:
e2f5f4b110
Change-Id: I00442fe091dab72bb114ac77c20845de0050cb0f
Justin Klaassen [Thu, 17 Aug 2017 01:59:23 +0000 (01:59 +0000)]
Merge "Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
1c414bf30b -s ours" into oc-mr1-dev
am:
ed3a8d337d -s ours
Change-Id: Iea2a6a3e81cfeb1fb91e308647e64422171e35c1
Hall Liu [Thu, 17 Aug 2017 01:53:47 +0000 (01:53 +0000)]
Merge "Revert "Fix lint errors in the streaming API"" am:
42d3eadb37 am:
cb63a47d41
am:
c7ac478f51
Change-Id: I55f9d7e583950a5a67de8775b6c0f1640430aac8
TreeHugger Robot [Thu, 17 Aug 2017 01:52:01 +0000 (01:52 +0000)]
Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev
Hall Liu [Thu, 17 Aug 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Revert "Fix lint errors in the streaming API"" am:
42d3eadb37
am:
cb63a47d41
Change-Id: I16e4b79d7fd40bf5d0e500e0cb3ba9bf33113fc8
Selim Cinek [Thu, 17 Aug 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev
am:
c4ed76f527
Change-Id: I6750f9da0520ae03683d0887283bcb197599b9d1
Hall Liu [Thu, 17 Aug 2017 01:30:56 +0000 (01:30 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
am:
42d3eadb37
Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
Android Build Merger (Role) [Thu, 17 Aug 2017 01:27:30 +0000 (01:27 +0000)]
Merge "Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
1c414bf30b -s ours" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 01:27:06 +0000 (01:27 +0000)]
Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev
Justin Klaassen [Thu, 17 Aug 2017 01:25:24 +0000 (01:25 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
1c414bf30b
am:
3c3de4a43d
Change-Id: I5088c087911899c16e208e95ec9bb0a79f8341fc
Justin Klaassen [Thu, 17 Aug 2017 01:22:49 +0000 (01:22 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
1c414bf30b -s ours
Change-Id: Ia3cabe5460e2f9f2a532e9f038f80909e8176d9b
Hall Liu [Thu, 17 Aug 2017 01:22:19 +0000 (01:22 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
Android Build Merger (Role) [Thu, 17 Aug 2017 01:18:07 +0000 (01:18 +0000)]
Merge "Merge "Optionally append managed service approvals" into oc-dr1-dev am:
445a6d42ef -s ours am:
fd2587ee7f -s ours" into oc-mr1-dev-plus-aosp
Justin Klaassen [Thu, 17 Aug 2017 01:16:25 +0000 (01:16 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
1c414bf30b
Change-Id: I6bfe2c301f0d3cbae9d1aea60e984d32a71f0bd4
Julia Reynolds [Thu, 17 Aug 2017 01:14:17 +0000 (01:14 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev am:
445a6d42ef -s ours
am:
fd2587ee7f -s ours
Change-Id: Ib7b3416f35cd603b0dfd786dd0dc6abf6b116f3c
Julia Reynolds [Thu, 17 Aug 2017 01:12:36 +0000 (01:12 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev am:
445a6d42ef
am:
222941267d -s ours
Change-Id: I1f631ccb5b48380324e6d8818f4c5fb02cae2f15
Michael Wright [Wed, 16 Aug 2017 19:38:21 +0000 (20:38 +0100)]
Add new "fast" filter for ambient light.
The slow filter wasn't converging fast enough when we shortened the
debounce timings but we still want it to ensure there's a long term
change happening, so add a new filter that converges much faster. This
new fast filter is just a weighted sliding window just like the slow
filter, but it has a significantly smaller horizon.
Bug:
64514692
Test: manual
Change-Id: I1e990ac1e6a56268fa42a85399a2d41cc8dd2104
TreeHugger Robot [Thu, 17 Aug 2017 01:10:16 +0000 (01:10 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Felipe Leme [Wed, 16 Aug 2017 19:29:53 +0000 (12:29 -0700)]
Fixed NPE when cancellation signal is null.
Test: none for this particular issue, but CtsAutoFillServiceTestCases pass
Fixes:
64759228
Change-Id: I34170440ac388ec6ba7ed5632dc38543a84d0327
Siarhei Vishniakou [Thu, 17 Aug 2017 01:04:21 +0000 (01:04 +0000)]
Merge "DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527 am:
2ce8cd62c3" into oc-dr1-dev-plus-aosp
am:
3d042d2d39
Change-Id: I3be24ffb349a35269eeb1126f85a14126d73a8ce
Android Build Merger (Role) [Thu, 17 Aug 2017 00:54:41 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527 am:
8d272b9dd5 am:
7becb0edd9" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 17 Aug 2017 00:54:37 +0000 (00:54 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
am:
445a6d42ef
Change-Id: I7a39822f2bef0838cfe63d44646f513539d90c5c
Julia Reynolds [Thu, 17 Aug 2017 00:54:22 +0000 (00:54 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
am:
445a6d42ef -s ours
Change-Id: I8f4d84a128cbdca8e4a9c9e330765b324569bd1c
Siarhei Vishniakou [Thu, 17 Aug 2017 00:47:05 +0000 (00:47 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527 am:
8d272b9dd5
am:
7becb0edd9
Change-Id: I068e4ec0e835edf1e82b9f49476672e87873a175
Hall Liu [Thu, 17 Aug 2017 00:46:24 +0000 (00:46 +0000)]
Revert "Fix lint errors in the streaming API"
This reverts commit
e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33.
Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
Siarhei Vishniakou [Thu, 17 Aug 2017 00:43:10 +0000 (00:43 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527 am:
8d272b9dd5
am:
540d9cad77
Change-Id: I9bdc98340e6460f996c8e069d47154c2f9b1799d
Android Build Merger (Role) [Thu, 17 Aug 2017 00:40:09 +0000 (00:40 +0000)]
Merge "DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527 am:
2ce8cd62c3" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Thu, 17 Aug 2017 00:37:54 +0000 (00:37 +0000)]
Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev
am:
4c0e55d0fc
Change-Id: I9e4770632d233d0b05d6892b5a69f2020ff908e8
Siarhei Vishniakou [Thu, 17 Aug 2017 00:31:50 +0000 (00:31 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527
am:
2ce8cd62c3
Change-Id: I1921ef38b9cc018c293bb68ef2a26d4ed2b1c30c
TreeHugger Robot [Thu, 17 Aug 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
Siarhei Vishniakou [Thu, 17 Aug 2017 00:30:28 +0000 (00:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527
am:
8d272b9dd5
Change-Id: I17ee75a8177368c8bbe7d8bc82138c0edd5b9c02
Siarhei Vishniakou [Thu, 17 Aug 2017 00:30:26 +0000 (00:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527
am:
8d272b9dd5
Change-Id: I2769deb20586586d8dcefd451ab2e95da348acad
Andreas Huber [Thu, 17 Aug 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." am:
2c4dfa0412 am:
013bea3d42 am:
63887bc79f
am:
1559d73539
Change-Id: Iacac18b31cca74740df188b282bbfb08d90c5a11
Andreas Huber [Thu, 17 Aug 2017 00:15:38 +0000 (00:15 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." am:
2c4dfa0412 am:
013bea3d42
am:
63887bc79f
Change-Id: I04e95523535764add139742511819c6cc751c99a
Siarhei Vishniakou [Thu, 17 Aug 2017 00:14:48 +0000 (00:14 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours
am:
3455f8f527
Change-Id: Id27376f6e99bb52527e6f02af9a2a654bdc1f5b0
David Stevens [Thu, 17 Aug 2017 00:13:06 +0000 (00:13 +0000)]
Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev
am:
341cd735cb
Change-Id: Ibc06854ff0382055f1cff814f2e707531875e714
Siarhei Vishniakou [Thu, 17 Aug 2017 00:08:44 +0000 (00:08 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours
am:
3455f8f527
Change-Id: Idf1ace43e625be116acee24755ca327f47310d35
Android Build Merger (Role) [Thu, 17 Aug 2017 00:05:54 +0000 (00:05 +0000)]
Merge "Merge "Log SystemServerShutdown earlier" into oc-mr1-dev am:
70aa7bbc81" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 17 Aug 2017 00:04:06 +0000 (00:04 +0000)]
Merge "Merge "Fix lint errors in the streaming API" am:
b0f5d57489 am:
90b923f398 am:
34639cbbab am:
e168449b32" into oc-mr1-dev-plus-aosp
Fyodor Kupolov [Thu, 17 Aug 2017 00:02:32 +0000 (00:02 +0000)]
Merge "Log SystemServerShutdown earlier" into oc-mr1-dev
am:
70aa7bbc81
Change-Id: I6f81c9855e95c54382185d556183c609ce68e85c
Hall Liu [Wed, 16 Aug 2017 23:59:45 +0000 (23:59 +0000)]
Merge "Fix lint errors in the streaming API" am:
b0f5d57489 am:
90b923f398 am:
34639cbbab
am:
e168449b32
Change-Id: Idc7b2897dc4a1bda38455d6fade54153770d176f
Dianne Hackborn [Tue, 15 Aug 2017 21:10:39 +0000 (14:10 -0700)]
Small fix to pm dumpsys formatting.
Get rid of a spurious newline.
Test: builds and runs and prints.
Bug:
64770628
Change-Id: I2b7657ada5e8eb0a2ef90b1bc2e1027493c808a3
OSDN Git Service
