OSDN Git Service
Makoto Onuki [Tue, 5 Jun 2018 00:40:26 +0000 (17:40 -0700)]
Merge "Ensure automatic battery saver won't stick" into pi-dev
am:
c1203d6a96
Change-Id: I98897510188c38309f708d86802f83ef3573984d
Andrew Sapperstein [Tue, 5 Jun 2018 00:28:50 +0000 (17:28 -0700)]
Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev
am:
0c6929ec04
Change-Id: I2f1c4b07946290e3adde90af82b6f7a2ec55f2b1
Ying Zheng [Tue, 5 Jun 2018 00:16:19 +0000 (17:16 -0700)]
Merge "Read build flag to determine user model." into pi-dev
am:
9b5267f914
Change-Id: I08c8e72fdbad7b20ac6039c441feabf2ac31205c
TreeHugger Robot [Mon, 4 Jun 2018 23:35:15 +0000 (23:35 +0000)]
Merge "Ensure automatic battery saver won't stick" into pi-dev
TreeHugger Robot [Mon, 4 Jun 2018 23:27:42 +0000 (23:27 +0000)]
Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev
Ying Zheng [Mon, 4 Jun 2018 23:21:44 +0000 (23:21 +0000)]
Merge "Read build flag to determine user model." into pi-dev
Ying Zheng [Fri, 1 Jun 2018 22:55:30 +0000 (15:55 -0700)]
Read build flag to determine user model.
Bug:
109698349
Test: Manual
Change-Id: I180b6a877ead576b0ed1292376fe0e74b0df1fd9
Andrii Kulian [Mon, 4 Jun 2018 22:08:47 +0000 (15:08 -0700)]
Merge "Defer client visibility update when calculating new config" into pi-dev
am:
f0e2c8bdde
Change-Id: I4c00d12154728287088bf946306ad78e805f2aec
Andrii Kulian [Mon, 4 Jun 2018 21:55:13 +0000 (21:55 +0000)]
Merge "Defer client visibility update when calculating new config" into pi-dev
Fyodor Kupolov [Mon, 4 Jun 2018 21:47:39 +0000 (14:47 -0700)]
Merge "New behavior of setSynchronousMode" into pi-dev
am:
492457e94e
Change-Id: I45c388d4386b443a48b6c94632c373dfe1aa8af3
TreeHugger Robot [Mon, 4 Jun 2018 21:30:17 +0000 (21:30 +0000)]
Merge "New behavior of setSynchronousMode" into pi-dev
Hongming Jin [Mon, 4 Jun 2018 21:19:06 +0000 (14:19 -0700)]
Merge "Add shell command handler for account manager to allow enabling service binding for instant app. Test: cts-tradefed run cts -m CtsAccountManagerTestCases cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases Bug:
79367659" into pi-dev
am:
64896541d4
Change-Id: I6221649f9035bcaa5dea4066b5a61c9dc8fdb06d
Jackal Guo [Mon, 4 Jun 2018 21:11:44 +0000 (14:11 -0700)]
Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev
am:
15ebbeb9fd
Change-Id: I6447f40dae907f63042024ac9558aa9ba6f6f4fd
Adrian Roos [Mon, 4 Jun 2018 21:06:29 +0000 (14:06 -0700)]
[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a am:
6281d64277 am:
668761b146 -s ours
am:
60d179780f -s ours
Change-Id: I42f926077f2aa80eafd18bfdbbea22dbcee634c2
Lucas Dupin [Mon, 4 Jun 2018 20:56:52 +0000 (13:56 -0700)]
Merge "Blank screen when coming from pulse" into pi-dev
am:
842ec5085b
Change-Id: Iac099da89693788cab0da36f5feecf66fd92ecef
Makoto Onuki [Mon, 4 Jun 2018 20:54:25 +0000 (13:54 -0700)]
Ensure automatic battery saver won't stick
Fixes:
80527470
Test: Manual tests:
Test 1: (make sure automatic BS won't stick)
- Set up automatic battery saver at N%
- Wait until the battery goes below N% -> Battery saver will turn on
- Turn off the device
- Charge it until the battery goes above N%
- Turn on the device
- Make sure battery saver is off.
Test 1: (make sure manual BS will stick)
- Make sure the battery level is above the automatic threshold
- Manually enable BS
- Reboot
- Make sure battery saver is on.
Change-Id: I677fd586f6b25d0200392941cac2d13b57fe10b3
Yin-Chia Yeh [Mon, 4 Jun 2018 20:51:59 +0000 (13:51 -0700)]
Merge "Camera: fix off by one error" into pi-dev
am:
4003570f57
Change-Id: Ide0f16e58ac2f83320cd8057ee243b9cce45edaa
Hongming Jin [Mon, 4 Jun 2018 20:38:46 +0000 (20:38 +0000)]
Merge "Add shell command handler for account manager to allow enabling service binding for instant app. Test: cts-tradefed run cts -m CtsAccountManagerTestCases cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases Bug:
79367659" into pi-dev
Andrew Sapperstein [Mon, 4 Jun 2018 20:33:58 +0000 (20:33 +0000)]
Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"
This reverts commit
44c4ca41d83d73d7c1d0e217a80a46a449e8c475.
Reason for revert: Wanted to go with a different option and this was mistakenly Dr. No'ed.
Bug:
80444486
Test: clean revert
Change-Id: I7fdd13a5bc0f4d9fabf91f3e5497c4065008b531
TreeHugger Robot [Mon, 4 Jun 2018 20:32:30 +0000 (20:32 +0000)]
Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev
Adrian Roos [Mon, 4 Jun 2018 19:49:11 +0000 (12:49 -0700)]
[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a am:
6281d64277
am:
668761b146 -s ours
Change-Id: Icf2ed114aa3c2bf500ea59c3f52ec75d0f73ff84
TreeHugger Robot [Mon, 4 Jun 2018 19:45:18 +0000 (19:45 +0000)]
Merge "Blank screen when coming from pulse" into pi-dev
TreeHugger Robot [Mon, 4 Jun 2018 19:34:19 +0000 (19:34 +0000)]
Merge "Camera: fix off by one error" into pi-dev
Erik Kline [Mon, 4 Jun 2018 18:59:48 +0000 (11:59 -0700)]
[automerger skipped] Merge "Clear IPv4 address on tethering teardown." am:
86e94acfa4
am:
877328afa9 -s ours
Change-Id: If86894bf2ee14217b9d58da99b90f0909ce59a10
Erik Kline [Mon, 4 Jun 2018 18:49:28 +0000 (11:49 -0700)]
Merge "Send empty LinkProperties when entering StoppedState." am:
59ccf1041f
am:
48b64fd9f2
Change-Id: Ib946351005140d59e6a559610aa7448ab19c2630
Sundong Ahn [Mon, 4 Jun 2018 18:31:38 +0000 (11:31 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am:
bd83ac0ecc
am:
7295fd2af4
Change-Id: Ib1964e9082209649f7e909bc075da1a61efc2af1
Adrian Roos [Mon, 4 Jun 2018 18:18:38 +0000 (11:18 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a
am:
6281d64277
Change-Id: Ic7b12c406ac5aea0e9f40b5f2c2f72c5efd87212
David Brazdil [Mon, 4 Jun 2018 18:01:48 +0000 (11:01 -0700)]
Merge "Add another entry to hidden API light grey" into pi-dev
am:
23621e7f02
Change-Id: Ib4c4c5afc6451dfed012c7233d056aabd392fe7f
Nicolas Geoffray [Mon, 4 Jun 2018 17:54:50 +0000 (10:54 -0700)]
Add more light grey APIs.
am:
b4d26bdd4c
Change-Id: I40f4a8b5b1777b37cf2985f54516cfb7e89cf15f
Bill Yi [Mon, 4 Jun 2018 17:39:30 +0000 (10:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
dea740bdce -s ours
Change-Id: Ibe1c567b2ff2d32f4287aa9d2bf1d676520cfdd3
Bill Yi [Mon, 4 Jun 2018 17:37:50 +0000 (10:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
499ab31d92 -s ours
Change-Id: Ib34d094c16349d566a109cc8ec89607aaccdfacc
Erik Kline [Mon, 4 Jun 2018 17:36:28 +0000 (10:36 -0700)]
Merge "Clear IPv4 address on tethering teardown."
am:
86e94acfa4
Change-Id: Ibea385035880e971445b10d814d04c7419d3aaff
Bill Yi [Mon, 4 Jun 2018 17:35:19 +0000 (10:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
eecbf8d318 -s ours
Change-Id: I8ca084bda9030e414fb44c58b441ab23f62215ea
Bill Yi [Mon, 4 Jun 2018 17:32:27 +0000 (10:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
874fab7208 -s ours
Change-Id: I2640ed95dfa28b37365ed77d284c2ce547506b8e
Erik Kline [Mon, 4 Jun 2018 17:26:40 +0000 (10:26 -0700)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
59ccf1041f
Change-Id: I0405006d15bc5d05d09202fa9dbc81989a9c0717
Bill Yi [Mon, 4 Jun 2018 17:26:27 +0000 (10:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aef1031ce6 -s ours
Change-Id: I0409ab5ffae60156820044018b323b5385692aa6
David Brazdil [Mon, 4 Jun 2018 17:14:49 +0000 (17:14 +0000)]
Merge "Add another entry to hidden API light grey" into pi-dev
Sundong Ahn [Mon, 4 Jun 2018 17:14:24 +0000 (10:14 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
am:
bd83ac0ecc
Change-Id: I5f786115b1a81a6505e473dc51e82b6b14037d22
Bill Yi [Mon, 4 Jun 2018 17:07:15 +0000 (10:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0edea4caec -s ours
Change-Id: I6c4f3bea431c06a4f9e0d843a752f1ecb8eac0f0
Adrian Roos [Mon, 4 Jun 2018 17:02:32 +0000 (10:02 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
am:
f04714c59a
Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80
Hongming Jin [Wed, 30 May 2018 18:01:06 +0000 (11:01 -0700)]
Add shell command handler for account manager to allow enabling service
binding for instant app.
Test: cts-tradefed run cts -m CtsAccountManagerTestCases
cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases
Bug:
79367659
Change-Id: I3ac968ebc20be68da08293d9b685a01920f11b76
Yin-Chia Yeh [Mon, 4 Jun 2018 16:23:14 +0000 (09:23 -0700)]
Camera: fix off by one error
Test: DngCreator CTS test
Bug:
74434422
Change-Id: Ib8aa5f1eec6a5213f6c2c3aeb2d46475107f13c6
TreeHugger Robot [Mon, 4 Jun 2018 11:44:21 +0000 (11:44 +0000)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
David Brazdil [Mon, 4 Jun 2018 10:38:16 +0000 (11:38 +0100)]
Add another entry to hidden API light grey
Bug:
80553977
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: Ic63b7c21ec77ac67b495a5cc5b8b9336ba41fc46
Treehugger Robot [Mon, 4 Jun 2018 09:45:25 +0000 (09:45 +0000)]
Merge "Clear IPv4 address on tethering teardown."
Erik Kline [Fri, 18 May 2018 07:09:24 +0000 (16:09 +0900)]
Clear IPv4 address on tethering teardown.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- wlan0 in STA mode, wlan1 up/down in AP mode
no lingering IPv4 mode
- USB tethering up/down works
- bluetooth tethering yields:
05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
which is acceptable (no actual crash, just a log message)
Bug:
79905644
Merged-In: Ie898adc4efbb7376f0297abacdfe39c8700f0722
Merged-In: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd
Merged-In: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
(cherry picked from commit
472276a874316b725027098b79e1c9f03c62cad2)
Change-Id: Icb5c4f7971af4715c7662f80194b4c1ce369a135
Nicolas Geoffray [Mon, 4 Jun 2018 07:59:25 +0000 (08:59 +0100)]
Add more light grey APIs.
bug:
109588718
Test: m
Change-Id: Ibf0d0366a2a20124dfaafbc39015a1eb3c1ecedf
Erik Kline [Mon, 4 Jun 2018 07:41:51 +0000 (07:41 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Treehugger Robot [Mon, 4 Jun 2018 04:54:27 +0000 (04:54 +0000)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
TreeHugger Robot [Sun, 3 Jun 2018 23:30:24 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:34:21 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:26:29 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:22:26 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:22:20 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 3 Jun 2018 14:48:00 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3d8f7c63c86424767ea717511e218c090090a5a2
Bill Yi [Sun, 3 Jun 2018 14:40:47 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie47fd40001b22ebd53a452443a52fb3449c3ee68
Bill Yi [Sun, 3 Jun 2018 12:41:32 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I470dc0700da24f49ea47c107089be2fc91175e87
Bill Yi [Sun, 3 Jun 2018 11:01:15 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ide5351c17e5deb31ebccd586440cf7755bb9b9de
Bill Yi [Sun, 3 Jun 2018 10:47:25 +0000 (03:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b358135c0013b5ba30f5d416fd252d474f090bf
Bill Yi [Sun, 3 Jun 2018 10:27:06 +0000 (03:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If6ca37ec539ab563a635e938845fcc6643b8e2b8
Andrii Kulian [Thu, 31 May 2018 19:43:54 +0000 (12:43 -0700)]
Defer client visibility update when calculating new config
In ActivityStackSupervisor#ensureVisibilityAndConfig() we first
update visibility of all activities to be able to properly calculate
configuration on the next step. However, we need to make sure the
latest config is applied whenever a client becomes visible.
To prevent making making activities visible without latest config
this CL defers messages to client in first visibility calculation
pass.
Bug:
76011287
Test: ActivityLifecycleTests
Test: ActivityManagerAppConfigurationTests
Change-Id: I978fc800322fb502545650b9f2eece96cd9c7f40
John Reck [Fri, 1 Jun 2018 22:46:52 +0000 (15:46 -0700)]
Merge "Ensure picture isn't recording in createBitmap" into pi-dev
am:
c4f520ddb6
Change-Id: Ia5170bac1cb32c1ce860c01ee499aab134e22ed0
John Reck [Fri, 1 Jun 2018 22:25:52 +0000 (22:25 +0000)]
Merge "Ensure picture isn't recording in createBitmap" into pi-dev
Alan Viverette [Fri, 1 Jun 2018 20:41:12 +0000 (13:41 -0700)]
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev
am:
4eca92d579
Change-Id: Iba6e9fcf6e697cc630e36b81b27ad1c80a6aa2d6
Alan Viverette [Fri, 1 Jun 2018 20:29:04 +0000 (20:29 +0000)]
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev
John Reck [Fri, 1 Jun 2018 19:39:50 +0000 (12:39 -0700)]
Ensure picture isn't recording in createBitmap
Picture#draw() will silently due an #endRecording() if it
wasn't called. Bitmap.createBitmap doesn't do this until
after it's too late.
So do an up-front #endRecording() to ensure state is
good to go
Bug:
80539264
Test: HardwareBitmapTests#testReadbackThroughPictureNoEndRecording
Change-Id: Ic66c41462e88880b73c5093d7541c4ce3d71adeb
Bill Yi [Fri, 1 Jun 2018 19:52:05 +0000 (12:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ce67e5d1d5 -s ours
Change-Id: I793e236feb2666c7ec2081b6cab4cc474eda7a1f
TreeHugger Robot [Fri, 1 Jun 2018 19:35:37 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Fyodor Kupolov [Fri, 1 Jun 2018 19:11:42 +0000 (12:11 -0700)]
New behavior of setSynchronousMode
setSynchronousMode is now applicable to any journal mode.
This can be useful for apps that want to use stricter durability
settings for their database.
Test: android.database.sqlite.cts.SQLiteDatabaseTest
Bug:
86953240
Change-Id: I7dbaa6d0bc0975da8067e87b402f63f51b4add10
Pavel Maltsev [Fri, 1 Jun 2018 18:40:16 +0000 (11:40 -0700)]
[automerger skipped] Merge "Fix comments to reflect changes in eth service" am:
1f392c468a
am:
967ee98726 -s ours
Change-Id: Ia330744195e2e4ac9182b762ae3c89c1602d3727
Lucas Dupin [Fri, 1 Jun 2018 07:28:58 +0000 (00:28 -0700)]
Blank screen when coming from pulse
We need to fade from black to the app to achieve a nice transition.
Test: visual
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I13edd9c5f7a1bf9378851ac50c513d36ab821c43
Fixes:
87939048
Bill Yi [Fri, 1 Jun 2018 18:32:11 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1c0fac386f -s ours
Change-Id: I525a8a78e4fd17b533505e2d5fed9de0d1e5e5d9
Bill Yi [Fri, 1 Jun 2018 18:28:39 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e1475f7ceb9b2b0b37ff52297f550c2b2b6cb0d
Pavel Maltsev [Fri, 1 Jun 2018 18:28:04 +0000 (11:28 -0700)]
Merge "Fix comments to reflect changes in eth service"
am:
1f392c468a
Change-Id: I542f43603ef19387c57b74cdadf0900548256c39
TreeHugger Robot [Fri, 1 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Hongming Jin [Fri, 1 Jun 2018 17:36:14 +0000 (10:36 -0700)]
Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug:
77821568" into pi-dev
am:
dbc6052022
Change-Id: I137f5df296a05d7ec128427d8aafd5ae66b519f7
Treehugger Robot [Fri, 1 Jun 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Fix comments to reflect changes in eth service"
Hongming Jin [Fri, 1 Jun 2018 17:15:21 +0000 (17:15 +0000)]
Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug:
77821568" into pi-dev
Bill Yi [Fri, 1 Jun 2018 13:50:46 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I35f7064ae1d2f8bde001b3b201a9107736a077e5
Nicolas Geoffray [Fri, 1 Jun 2018 12:04:23 +0000 (05:04 -0700)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev
am:
f225af4f6c
Change-Id: I024d5569d7b8ffb1105e9c78f16c7e2ad814e24b
Tiger Huang [Fri, 1 Jun 2018 11:58:42 +0000 (04:58 -0700)]
Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
am:
a41c75d6d0
Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd
Bill Yi [Fri, 1 Jun 2018 11:53:17 +0000 (04:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a70ada7ebd -s ours
Change-Id: I60e1afeade49ea7180987d7c67674c98ad3502a2
Erik Kline [Fri, 1 Jun 2018 11:51:36 +0000 (04:51 -0700)]
Merge "Clear IPv4 address on tethering teardown." into pi-dev
am:
36d41793e2
Change-Id: Ie898adc4efbb7376f0297abacdfe39c8700f0722
Makoto Onuki [Fri, 1 Jun 2018 11:46:08 +0000 (04:46 -0700)]
Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
am:
079f6d7fa6
Change-Id: I299267e20b78810002bab56488b9436456936d11
Robert Carr [Fri, 1 Jun 2018 11:40:41 +0000 (04:40 -0700)]
Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev
am:
7d2d403a83
Change-Id: I583fc7299ddd319e90a33c1f8d07157f52e0975a
John Reck [Fri, 1 Jun 2018 11:31:50 +0000 (04:31 -0700)]
Merge "Attempting to fix the black flicker" into pi-dev
am:
b559512508
Change-Id: I95ee7346a8d2f10c07185d3c386a7ee778f6bd98
Nicolas Geoffray [Fri, 1 Jun 2018 08:57:34 +0000 (08:57 +0000)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev
Tiger Huang [Fri, 1 Jun 2018 07:49:56 +0000 (07:49 +0000)]
Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
TreeHugger Robot [Fri, 1 Jun 2018 06:00:23 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 1 Jun 2018 05:53:35 +0000 (05:53 +0000)]
Merge "Clear IPv4 address on tethering teardown." into pi-dev
Makoto Onuki [Fri, 1 Jun 2018 05:35:02 +0000 (05:35 +0000)]
Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
Erik Kline [Fri, 18 May 2018 07:09:24 +0000 (16:09 +0900)]
Clear IPv4 address on tethering teardown.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- wlan0 in STA mode, wlan1 up/down in AP mode
no lingering IPv4 mode
- USB tethering up/down works
- bluetooth tethering yields:
05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
which is acceptable (no actual crash, just a log message)
Bug:
79905644
Change-Id: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
Jackal Guo [Thu, 31 May 2018 07:01:34 +0000 (15:01 +0800)]
Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS
Update the logic in PackageParser to avoid unistalled system app
can't be found.
Test: follow steps on b/
80444486 and can add account normally
Test: PackageManagerTest
Bug:
80444486
Change-Id: Ifafac34111d883e51563018be793655c25d09fba
Derek Sollenberger [Fri, 1 Jun 2018 03:51:45 +0000 (20:51 -0700)]
Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev
am:
6a1df0d541
Change-Id: Idd4a3432df50e502a84747d240a1940bf3cb6b8c
Winson Chung [Fri, 1 Jun 2018 03:43:09 +0000 (20:43 -0700)]
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev
am:
83bf0877b8
Change-Id: Ic5af6c8eb39025f76c89ea8900ca2302c00ff209
Hall Liu [Fri, 1 Jun 2018 03:33:01 +0000 (20:33 -0700)]
Merge "Move the "repeated calls" caveat" into pi-dev
am:
7897fa3b9a
Change-Id: Ifbc5e1ffb1093ae9e5abd398dbb3eb190d67142f
Winson Chung [Fri, 1 Jun 2018 03:23:26 +0000 (20:23 -0700)]
Merge "Fix regression in virtual key haptics" into pi-dev
am:
c197176cd2
Change-Id: Ifef4e6978d0731b6270eb0fc0b1fe23fe27d1d3b
Colin Cross [Fri, 1 Jun 2018 03:19:27 +0000 (20:19 -0700)]
[automerger skipped] Merge "Add support for --replace-version to aapt2" am:
186be90eb6
am:
5c0601d65a -s ours
Change-Id: I7614f591744a46274e657f38dcf9ee364c274d1a
TreeHugger Robot [Fri, 1 Jun 2018 03:15:13 +0000 (03:15 +0000)]
Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev
Android Build Merger (Role) [Fri, 1 Jun 2018 03:14:52 +0000 (03:14 +0000)]
Merge "Merge "Fix MbmsDownloadSession documentation" am:
bb2ce1010e am:
76f1bd4979" into pi-dev-plus-aosp
OSDN Git Service
