OSDN Git Service
Bill Yi [Wed, 30 Aug 2017 21:25:10 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9b9099ef3b -s ours
Change-Id: Ia903a6127eee43bd4eac71869207da7634e22db7
Bill Yi [Wed, 30 Aug 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
b997ba1131 -s ours
Change-Id: I372f1f65bc2d9918eb6d04c74d0c792516be484c
Bill Yi [Wed, 30 Aug 2017 21:14:03 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
249c45391e -s ours
Change-Id: I6181ef920c9baab4fa905b3d8772083e4f0bc650
Bill Yi [Wed, 30 Aug 2017 21:05:22 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f5bc976699 -s ours
Change-Id: I57c8b921cf49a36adab1bc7b234427c02f1c3337
Bill Yi [Wed, 30 Aug 2017 20:56:39 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
2ec3964ba4 -s ours
Change-Id: I9ca5dad4cd98b4d04d98858575e9f486be245e1f
Bill Yi [Wed, 30 Aug 2017 20:48:07 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
26f4e4dfca -s ours
Change-Id: Ia8bef787b37b25450ad7ee694a11944685ece713
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:18:07 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1dab2308cd -s ours
Change-Id: Ie93b8ab0d1d64cea8f2fcc03171e688788bd0bb0
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Ng [Wed, 30 Aug 2017 20:01:55 +0000 (20:01 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
am:
45e7a4242b
Change-Id: I902415bf0648c934e1c5e0988e2d2052eb9df013
Bill Yi [Wed, 30 Aug 2017 19:50:09 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
7604fe28e8 -s ours
Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Wed, 30 Aug 2017 19:14:21 +0000 (19:14 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
am:
f31cf45e82
Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:54:19 +0000 (18:54 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
am:
b00a8aa688
Change-Id: I71cc12349dd80bbb8b0a6776c3e8846baa3dd501
Brad Ebinger [Wed, 30 Aug 2017 18:48:34 +0000 (18:48 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
am:
ed6e29f292
Change-Id: Id412c0be939da6240a66a942730fd18badabb6c6
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Jim Miller [Wed, 30 Aug 2017 18:04:57 +0000 (18:04 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am:
fb8e9b9096
Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI. For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.
Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.
Thorough testing to verify behavior.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
Todd Kennedy [Wed, 30 Aug 2017 14:00:31 +0000 (14:00 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
am:
f4a484064b
Change-Id: Ief00d5cd83017aa1e48786660e5b94b0f73f4af0
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
Kevin Chyn [Wed, 30 Aug 2017 04:13:03 +0000 (04:13 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
am:
102e9e7858
Change-Id: I66a39771ca5d7d1f2648a21a7d4ae484c75c3219
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 03:53:42 +0000 (20:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1dbe08a427134a196041d6b68a220fc2a6a991d8
Tim Murray [Wed, 30 Aug 2017 02:51:26 +0000 (02:51 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
am:
23c981923f
Change-Id: Iee35e732fea26385d96a3ffa6756d944976f921f
Bill Yi [Wed, 30 Aug 2017 02:29:09 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16a811e84d3642459e686c84dcc5cecbbf5ada9b
Tim Murray [Wed, 30 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 02:10:49 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I48522f7eba9fae610d5551a3dcdf6292a4a0abb8
Bill Yi [Wed, 30 Aug 2017 02:04:00 +0000 (19:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666
Bill Yi [Wed, 30 Aug 2017 01:57:44 +0000 (18:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4eebbdb73bfd8558666b22135de33f7183ee8ee0
Jason Monk [Wed, 30 Aug 2017 01:56:58 +0000 (01:56 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
am:
b7e5a9da43
Change-Id: I5446f2a53a502be0e3d2556777bc1583c7059856
Bill Yi [Wed, 30 Aug 2017 01:51:00 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I77ff98cb6d61c557fb070c8ba9939bc7dd5637cd
Bill Yi [Wed, 30 Aug 2017 01:43:54 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6792eb7fe4f28b87cd53504b0c8318a751f33c27
Jason Monk [Wed, 30 Aug 2017 01:24:04 +0000 (01:24 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
Amith Yamasani [Wed, 30 Aug 2017 01:17:34 +0000 (01:17 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
am:
eb7b039304
Change-Id: Icc808587e11431ba869718732909b65203eca010
Carmen Jackson [Wed, 30 Aug 2017 01:07:24 +0000 (01:07 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
am:
22d055566a
Change-Id: I0b6deacd471b2a6c082cb2cc916e8ee577045c9e
Colin Cross [Wed, 30 Aug 2017 00:58:16 +0000 (00:58 +0000)]
Merge "Fix errorprone build" am:
3abddeca75 -s ours am:
069915cd1c -s ours
am:
88fa77b640 -s ours
Change-Id: Ife673fc55f2052461ee716fe14844d5636954dce
TreeHugger Robot [Wed, 30 Aug 2017 00:57:23 +0000 (00:57 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:53:33 +0000 (00:53 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
Colin Cross [Wed, 30 Aug 2017 00:46:45 +0000 (00:46 +0000)]
Merge "Fix errorprone build" am:
3abddeca75 -s ours
am:
069915cd1c -s ours
Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b
Colin Cross [Wed, 30 Aug 2017 00:36:36 +0000 (00:36 +0000)]
Merge "Fix errorprone build"
am:
3abddeca75 -s ours
Change-Id: I9eb51d858194869763c94260beeec05aac6578ee
Fyodor Kupolov [Wed, 30 Aug 2017 00:35:13 +0000 (00:35 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
am:
9328cb9fdf
Change-Id: I862810d4b0f13180e1126db1fdd90e9adf539d9c
Colin Cross [Wed, 30 Aug 2017 00:25:36 +0000 (00:25 +0000)]
Merge "Fix errorprone build"
Fyodor Kupolov [Wed, 30 Aug 2017 00:19:29 +0000 (00:19 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 00:11:28 +0000 (00:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
75c814fb00 -s ours
Change-Id: I3917a1715320b470e66f5caf9e7d2945c6f0de20
Christopher Tate [Wed, 30 Aug 2017 00:05:36 +0000 (00:05 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
am:
a050d6302f
Change-Id: I6568f85ca95ab4e20f5f5195c7b7eb4982e8ec57
TreeHugger Robot [Tue, 29 Aug 2017 23:56:50 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Ng [Tue, 29 Aug 2017 23:50:36 +0000 (23:50 +0000)]
Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev
am:
3390511e17
Change-Id: Ia016fa4b5ea92ae9dcfe5e8b6a0fe4584effed17
Christopher Tate [Tue, 29 Aug 2017 23:50:13 +0000 (16:50 -0700)]
Setting a wallpaper must be synchronous
Observable state needs to be fully established by the time the
caller is allowed to proceed, otherwise they might read stale
information. In particular, we hadn't yet committed changes to
the backing store by the time observers were released, so they
could then read a stale generation number as the "current" state.
With this fix, the flaky CTS test is now reliably passing.
Test: cts-tradefed run cts-dev -m CtsAppTestCases -t android.app.cts.WallpaperManagerTest\#setBitmapTest
Bug:
65016846
Change-Id: I93fc690caedfbcd455a91625a3c67fff9168483b
TreeHugger Robot [Tue, 29 Aug 2017 23:47:50 +0000 (23:47 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:41:47 +0000 (23:41 +0000)]
Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev
Tim Murray [Tue, 29 Aug 2017 23:21:27 +0000 (23:21 +0000)]
Revert "Fix transition between two occluding activities"
This reverts commit
791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed.
bug
65168260
Change-Id: Ib4bb2c694a7dc6c2359143b07edecaf894a2daee
Hugo Benichi [Tue, 29 Aug 2017 23:09:02 +0000 (23:09 +0000)]
Merge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev
am:
3027f4720a -s ours
Change-Id: Iff50bd84ac5d36e85bfb344c8bcc1697bca79a27
Jason Monk [Tue, 29 Aug 2017 22:58:00 +0000 (18:58 -0400)]
Auto dim the nav bar to help prevent diff aging
Test: runtest systemui
Bug:
63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4
Justin Klaassen [Tue, 29 Aug 2017 22:50:38 +0000 (22:50 +0000)]
Merge "Use localized strings for HD Audio option label" into oc-mr1-dev
am:
ced95e7f38
Change-Id: I791daac12e5e3e4a7435f412bbf2c22ba62e3463
Jean-Michel Trivi [Tue, 29 Aug 2017 22:43:19 +0000 (22:43 +0000)]
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
am:
8da5c64628
Change-Id: I9df4f18b59ed2d8434c66754820304bd9082f9e9
Tyler Gunn [Tue, 29 Aug 2017 22:36:41 +0000 (22:36 +0000)]
Merge "Track conference start in system elapsed time." into oc-mr1-dev
am:
4bbcb5c558 -s ours
Change-Id: Ie6b25b2aa21cbfd62b1dc106558d0c466082828a
Hugo Benichi [Tue, 29 Aug 2017 22:29:08 +0000 (22:29 +0000)]
Merge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev
* changes:
Nat464Xlat: interface notification handler on ConnectivityService
Nat464Xlat: internal state guards cleanup + state enum
Nat464Xlat: clat management cleanup
TreeHugger Robot [Tue, 29 Aug 2017 22:22:12 +0000 (22:22 +0000)]
Merge "Use localized strings for HD Audio option label" into oc-mr1-dev
Tyler Gunn [Tue, 29 Aug 2017 22:22:09 +0000 (22:22 +0000)]
Track conference start in system elapsed time.
am:
40f5ccd1d0 -s ours
Change-Id: I9536bd7f9290f307fa87d5ee78fe0762c9d95f2e
Bill Yi [Tue, 29 Aug 2017 22:13:46 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
db61e7ec73 -s ours
am:
5e122f003a -s ours
Change-Id: I4dbf34bd56ec8f92d7ab89442a28e7f59727f958
Jean-Michel Trivi [Tue, 29 Aug 2017 22:11:35 +0000 (22:11 +0000)]
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
Tyler Gunn [Tue, 29 Aug 2017 22:07:41 +0000 (22:07 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev
am:
0240dc99db
Change-Id: Ie386bdb4c77df1305d80f604f48174794c3ee0c1
Android Build Merger (Role) [Tue, 29 Aug 2017 21:28:36 +0000 (21:28 +0000)]
Merge "Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev am:
102520f88e" into oc-mr1-dev-plus-aosp
Tyler Gunn [Tue, 29 Aug 2017 21:22:56 +0000 (21:22 +0000)]
Merge "Track conference start in system elapsed time." into oc-mr1-dev
Evan Rosky [Tue, 29 Aug 2017 21:21:19 +0000 (21:21 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
am:
102520f88e
Change-Id: Ib6fd927e1d8af019ea2a644b95cd6dfc7ae8851d
Bill Yi [Tue, 29 Aug 2017 21:20:26 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
db61e7ec73 -s ours
am:
8c49bbb74a -s ours
Change-Id: I87f7b91e87b04a51ddb9f24a944df48764b06380
Bill Yi [Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
db61e7ec73 -s ours
Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175
Bill Yi [Tue, 29 Aug 2017 21:06:33 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
db61e7ec73 -s ours
Change-Id: Ifb8aae76ed66234e0e39d538d84e2567f9e26003
Tyler Gunn [Tue, 29 Aug 2017 21:06:20 +0000 (21:06 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 21:01:05 +0000 (21:01 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
Koji Fukui [Tue, 22 Aug 2017 07:51:11 +0000 (16:51 +0900)]
Set CPU Abis for updated system packages
Symptom:
If Chrome package is updated and is disabled after reboot, all apps are
crashed when they use WebView.
Root cause:
CPU Abis for updated system packages are not set when newer version
exist. Updated system packages are not fully scanned.
But WebView can use WebViewProvider in the system Chrome package. It
refers CPU Abis and crash happens.
Solution:
Set CPU Abis even if the system package has newer updated version.
Fixes:
64926227
Fixes:
62980149
Test: Manual
Change-Id: I1ddc7be5a5b8928189410e30a0506d11279d0279
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 29 Aug 2017 20:38:19 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic2c86003ba40e7884913155316bf5c9eae7dc514
Jiongxuan Gao [Tue, 29 Aug 2017 20:18:27 +0000 (20:18 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
am:
10477217f5
Change-Id: Ifb68ab61a474a559586b6ad76a6b25cc6fd167d3
TreeHugger Robot [Tue, 29 Aug 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
Hyunyoung Song [Tue, 29 Aug 2017 20:01:25 +0000 (20:01 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug:
65015602" into oc-mr1-dev
am:
cc4f60fe4b
Change-Id: Id657cc6bb5c5a63c408048c39908d24b2bc0cdb0
TreeHugger Robot [Tue, 29 Aug 2017 19:54:26 +0000 (19:54 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug:
65015602" into oc-mr1-dev
Colin Cross [Tue, 29 Aug 2017 19:18:55 +0000 (12:18 -0700)]
Fix errorprone build
Fixes:
frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:149: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:170: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
Bug:
64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Change-Id: I41dfdf87529e532df385617fa05c7006a7a14c86
Vladislav Kaznacheev [Tue, 29 Aug 2017 19:21:09 +0000 (19:21 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am:
6a1dad9194
Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba
Fyodor Kupolov [Tue, 29 Aug 2017 19:12:03 +0000 (12:12 -0700)]
Make shutdown logging thread-safe
Previously TRON_METRICS/SHUTDOWN_TIMINGS_LOG were accessed from
different threads. Now all access is properly synchronized.
Important: Moved saveMetrics from rebootOrShutdown. rebootOrShutdown
can be called directly from SystemServer class after reboot when
no metrics were collected.
Test: manual reboot/shutdown and verify that metrics are logged
Bug:
64815357
Change-Id: I7b02c9c6b10b920ce3532a0808ab71a0d6e07d2b
TreeHugger Robot [Tue, 29 Aug 2017 19:08:30 +0000 (19:08 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
Amith Yamasani [Mon, 28 Aug 2017 16:41:22 +0000 (09:41 -0700)]
Screen-pinning unpin security fails for secondary user. DO NOT MERGE
The setting that inidcates that the user must unlock the device first
to unpin an app is always read for the owner user, so if the owner
disables this it will also be disabled for all secondary users no
matter what they have selected.
Bug:
64235463
Test: Manual
- Enable Screen-pinning for owner
- Uncheck 'Ask for PIN when unpinning'
- Create a secondary user
- Create keyguard PIN
- Enable screen-pinning for secondary user
- Check 'Ask for PIN when unpinning'
- Exit settings and start an app
- Pin the app from recents
- Unpin the app
The keyguard should appear on unpin with this commit applied
Change-Id: I8b9a98dc50e061b14c091d723223577cd94513ab
Jean-Michel Trivi [Mon, 28 Aug 2017 19:40:55 +0000 (12:40 -0700)]
AudioService: log changes in OP_PLAY_AUDIO
Log changes to AppOpsManager.OP_PLAY_AUDIO in live player
Test: "adb shell dumpsys audio" after entering silence mode
Bug:
62258749
Bug:
64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909
Matthew Ng [Tue, 29 Aug 2017 18:24:58 +0000 (11:24 -0700)]
Prevent getting large bitmap log error for gobo
Forgotten to move a line of code to the area to ignore loading large
bitmaps causing an error log. The code related is ag/
2579729.
Test: manual - boot gobo device and read log
Change-Id: Iaeedf80b6fa25331f7db09e21db84574a53939b3
Fixes:
65127030
Sudheer Shanka [Tue, 29 Aug 2017 18:01:14 +0000 (18:01 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
am:
903dc2fdd2
Change-Id: I2810e61300d5c2317639b261898931e66d075cb5
TreeHugger Robot [Tue, 29 Aug 2017 17:58:06 +0000 (17:58 +0000)]
Merge "resolve merge conflicts of
1a5e87918ebe to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Jakub Pawlowski [Tue, 29 Aug 2017 17:41:39 +0000 (17:41 +0000)]
Fix GATT client leakage when scan is throttled (1/2)
am:
f507490404 -s ours
Change-Id: Ieae0bc1ff8131e86c4253cc5f5b1760e366b3c58
Sudheer Shanka [Tue, 29 Aug 2017 17:40:33 +0000 (17:40 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
Jiongxuan Gao [Thu, 24 Nov 2016 11:20:27 +0000 (20:20 +0900)]
Fix ListView can not be moved after rotation.
Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.
Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.
Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.
Bug:
34365764
Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Merged-In: I22ae624a0c51110cb69679f796926e3b2b36d0ac
(cherry picked from commit
ee02e1ce774777e85b10be6d1ad5c6083fa08c18)