OSDN Git Service
Makoto Onuki [Wed, 4 Apr 2018 21:36:31 +0000 (14:36 -0700)]
Merge "Simplify service wrapper initialization + make robust" into pi-dev
am:
291988ef59
Change-Id: Iaf87a5cf7f9bc3a949c55e8ca0f3eb91aebcbb24
Tarandeep Singh [Wed, 4 Apr 2018 21:26:02 +0000 (14:26 -0700)]
Merge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
am:
6dd11b53e2
Change-Id: Ib2ee4399c9d0f0892e3c0894e245db96d6496e33
Evan Laird [Wed, 4 Apr 2018 21:20:53 +0000 (14:20 -0700)]
Merge "Center airplane icon in its frame" into pi-dev
am:
ad9c39d571
Change-Id: I3ea27ceb7ce38ca8647cc9c72add1d91e99e9780
Makoto Onuki [Wed, 4 Apr 2018 21:15:46 +0000 (21:15 +0000)]
Merge "Simplify service wrapper initialization + make robust" into pi-dev
Winson Chung [Wed, 4 Apr 2018 21:10:46 +0000 (14:10 -0700)]
Merge changes from topic "navbar_fix" into pi-dev
am:
a20535b884
Change-Id: I7161c9bcc8fdf821a99c612647cede8edcb1ac19
TreeHugger Robot [Wed, 4 Apr 2018 21:04:51 +0000 (21:04 +0000)]
Merge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
Abodunrinwa Toki [Wed, 4 Apr 2018 21:04:37 +0000 (14:04 -0700)]
Merge "Fix TCS crash due to API changes." into pi-dev
am:
d6997b05e0
Change-Id: Ieee28f1623704fc20925820b19a502da9ea27510
TreeHugger Robot [Wed, 4 Apr 2018 21:04:35 +0000 (21:04 +0000)]
Merge "Center airplane icon in its frame" into pi-dev
Phil Weaver [Wed, 4 Apr 2018 20:58:39 +0000 (13:58 -0700)]
Merge "Don't clear a11y focus with lock held" into pi-dev
am:
2c1f2dfb74
Change-Id: Ifc4da96727c52d112afa79ef32ca5f64a3fc171c
TreeHugger Robot [Wed, 4 Apr 2018 20:52:34 +0000 (20:52 +0000)]
Merge changes from topic "navbar_fix" into pi-dev
* changes:
Allow resolving the quickstep service when the user is unlocked
Revert "Revert "Nav icons and quick step states are determined by service enabled""
Eugene Susla [Wed, 4 Apr 2018 20:50:34 +0000 (13:50 -0700)]
Merge "[DO NOT MERGE] Fix a11y action "expand notifications" when QS is open" into pi-dev
am:
a60cb52487
Change-Id: Icf6d083068b7a5ae60bcd35ad0b17eb5e62e4728
Dmitry Dementyev [Wed, 4 Apr 2018 20:45:53 +0000 (13:45 -0700)]
Merge "Clean up remaining TODOs in RecoveryController." into pi-dev
am:
c9d8357069
Change-Id: I7bdbd247f4c1293f2ee5862e4caac468b2338873
Felipe Leme [Wed, 4 Apr 2018 20:41:00 +0000 (13:41 -0700)]
Merge "Log when save UI is not showing because of the service's response." into pi-dev
am:
c2e68785fb
Change-Id: I2bf482951c015631f4cd2be69dba13e0ecb7e278
Lucas Dupin [Wed, 4 Apr 2018 20:36:05 +0000 (13:36 -0700)]
Merge "Hide status bar when bouncer is visible" into pi-dev
am:
52ef03701f
Change-Id: I5d63b2c53561a6066c8f4c9ac228c46555cb3f29
TreeHugger Robot [Wed, 4 Apr 2018 20:29:22 +0000 (20:29 +0000)]
Merge "Fix TCS crash due to API changes." into pi-dev
Phil Weaver [Wed, 4 Apr 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Don't clear a11y focus with lock held" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 20:26:23 +0000 (20:26 +0000)]
Merge "[DO NOT MERGE] Fix a11y action "expand notifications" when QS is open" into pi-dev
Dmitry Dementyev [Wed, 4 Apr 2018 20:25:39 +0000 (20:25 +0000)]
Merge "Clean up remaining TODOs in RecoveryController." into pi-dev
Felipe Leme [Wed, 4 Apr 2018 20:24:23 +0000 (20:24 +0000)]
Merge "Log when save UI is not showing because of the service's response." into pi-dev
Lucas Dupin [Wed, 4 Apr 2018 20:21:11 +0000 (20:21 +0000)]
Merge "Hide status bar when bouncer is visible" into pi-dev
Android Build Merger (Role) [Wed, 4 Apr 2018 19:59:46 +0000 (19:59 +0000)]
Merge "Merge "Modify isShowing method in Dialog" am:
46be1f15af am:
4b38e9587d" into pi-dev-plus-aosp
tiansiming [田思明] [Wed, 4 Apr 2018 19:59:09 +0000 (12:59 -0700)]
Merge "Modify isShowing method in Dialog" am:
46be1f15af
am:
4b38e9587d
Change-Id: Icbd590ffa9a8d0c744bac8a97780857c18595100
Matthew Ng [Wed, 4 Apr 2018 19:59:00 +0000 (12:59 -0700)]
Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev
am:
232efa8ce7
Change-Id: I478f3106d038f9c20ecdd8584d0456332046b177
Android Build Merger (Role) [Wed, 4 Apr 2018 19:54:45 +0000 (19:54 +0000)]
Merge "Merge "Check the size of the strings in the StringPool before flattening." into pi-dev am:
7281fe0a9b" into pi-dev-plus-aosp
Ryan Mitchell [Wed, 4 Apr 2018 19:54:28 +0000 (12:54 -0700)]
Merge "Check the size of the strings in the StringPool before flattening." into pi-dev
am:
7281fe0a9b
Change-Id: Id32a86c95b8a6da72e0abe20dc0e47355809e442
Android Build Merger (Role) [Wed, 4 Apr 2018 19:52:24 +0000 (19:52 +0000)]
Merge "Merge "Force creation of Socket upon Transform application" am:
119cf2bc61 am:
abcf07af81" into pi-dev-plus-aosp
Benedict Wong [Wed, 4 Apr 2018 19:52:00 +0000 (12:52 -0700)]
Merge "Force creation of Socket upon Transform application" am:
119cf2bc61
am:
abcf07af81
Change-Id: I2034448a22461d51728e66bcc0e965821aa4a42f
Bill Yi [Wed, 4 Apr 2018 19:49:40 +0000 (12:49 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
71cba7d0ec -s ours
Change-Id: I94947492b9487a7f8a59e74aeefe43e2a40a4534
tiansiming [田思明] [Wed, 4 Apr 2018 19:47:13 +0000 (12:47 -0700)]
Merge "Modify isShowing method in Dialog"
am:
46be1f15af
Change-Id: I9d1cd55d51c37571d199ebbb5975f490e0969a92
Lucas Dupin [Wed, 4 Apr 2018 19:44:56 +0000 (12:44 -0700)]
Merge "Revert angle classifier relaxation" into pi-dev
am:
1119605853
Change-Id: Ifdca897151193c834860d0ff13f5d50b13c7c22c
Benedict Wong [Wed, 4 Apr 2018 19:43:36 +0000 (12:43 -0700)]
Merge "Force creation of Socket upon Transform application"
am:
119cf2bc61
Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796
Bo Zhu [Wed, 4 Apr 2018 19:33:10 +0000 (12:33 -0700)]
Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev
am:
e73074e9a8
Change-Id: I50e3ee0083badc478dd9be5c647b351bfd2a840c
Fyodor Kupolov [Wed, 4 Apr 2018 19:28:29 +0000 (12:28 -0700)]
Merge "Fix reading exception from Parcel" into pi-dev
am:
e269a5ac62
Change-Id: I3c4ee53e8f1e96f58034ac89e7f4bb65dd549120
Stephen [Wed, 4 Apr 2018 19:23:19 +0000 (12:23 -0700)]
Merge "Adding methods to greylist Test: None" into pi-dev
am:
657f173a6d
Change-Id: I1fb8639c718965a00fad6325f6af392dc1b49aaa
TreeHugger Robot [Wed, 4 Apr 2018 19:22:00 +0000 (19:22 +0000)]
Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 19:21:47 +0000 (19:21 +0000)]
Merge "Check the size of the strings in the StringPool before flattening." into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 19:20:49 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 19:18:13 +0000 (19:18 +0000)]
Merge "Revert angle classifier relaxation" into pi-dev
Makoto Onuki [Fri, 30 Mar 2018 19:39:14 +0000 (12:39 -0700)]
Simplify service wrapper initialization + make robust
- Simplify the logic, no more AtomicIntegers.
- Make robust -- if we know we've successfully created an instance before,
but the instance is now gone, re-initialize again.
- Added CTS.
Bug:
75964116
Fixes:
75964116
Bug:
71882178
Fixes:
71882178
Test: Manual test with UC Browser
Test: atest /android/pi-dev/cts/tests/tests/content/src/android/content/cts/ContextTest.java#testGetSystemService_multiThreaded
Change-Id: I12a9834d0f62e90e6f5d806a124cbdade415440c
Bo Zhu [Wed, 4 Apr 2018 19:13:40 +0000 (19:13 +0000)]
Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev
Fyodor Kupolov [Wed, 4 Apr 2018 19:13:21 +0000 (19:13 +0000)]
Merge "Fix reading exception from Parcel" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 19:09:55 +0000 (19:09 +0000)]
Merge "Adding methods to greylist Test: None" into pi-dev
Felipe Leme [Wed, 4 Apr 2018 18:57:03 +0000 (11:57 -0700)]
Log when save UI is not showing because of the service's response.
Bug:
74553423
Test: manual verification
Change-Id: I2ed43866b8384de2edea1a12e3da6adae2292c29
Bill Yi [Wed, 4 Apr 2018 18:55:24 +0000 (11:55 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d60da1cc7b -s ours
Change-Id: Id3472c2da96db6ec82929bdec1bfd304329658ff
TreeHugger Robot [Wed, 4 Apr 2018 18:42:38 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Treehugger Robot [Wed, 4 Apr 2018 18:39:38 +0000 (18:39 +0000)]
Merge "Modify isShowing method in Dialog"
Winson Chung [Wed, 4 Apr 2018 16:13:37 +0000 (09:13 -0700)]
Allow resolving the quickstep service when the user is unlocked
- When the user is locked, resolving components through package manager
will default to match only the components aware of the current lock
state. To ensure that we resolve to the quickstep service we need to
match against all components including those that are direct boot
unaware.
Bug:
77566214
Test: Restart the phone
Change-Id: Iab225473795b0051df304166816c4c5c9b00c1de
Winson Chung [Wed, 4 Apr 2018 17:02:29 +0000 (17:02 +0000)]
Revert "Revert "Nav icons and quick step states are determined by service enabled""
This reverts commit
317ee507c2ea69044dc91f7c6d019deeab1ebeae.
Reason for revert: Have fix for b/
77566214
Test: manual
Bug:
77566214
Change-Id: Ie827e3651f70dfde5f02a5099fd81a5eb4e4cd5e
Rohan Shah [Wed, 4 Apr 2018 18:05:57 +0000 (11:05 -0700)]
Merge "[Notif] Cache bool instead of manager/info" into pi-dev
am:
ae26aa74a3
Change-Id: I55973ab35d88a87daf0fb3e9e459d3bc57b33585
Dmitry Dementyev [Wed, 4 Apr 2018 18:00:39 +0000 (11:00 -0700)]
Merge "Remove deprecated recoverable keystore classes." into pi-dev
am:
654598b542
Change-Id: I883e6e98285fc9cb05cd46d6f88efda2437655ca
TreeHugger Robot [Wed, 4 Apr 2018 18:00:31 +0000 (18:00 +0000)]
Merge "[Notif] Cache bool instead of manager/info" into pi-dev
Lucas Dupin [Wed, 4 Apr 2018 17:50:41 +0000 (10:50 -0700)]
Revert angle classifier relaxation
Not necessary anymore because we now have a more generic solution
Change-Id: I3f4c509953b79ac6ea4ef67489474c5fb37c7109
Fixes:
77553611
Test: Swipe up and down on keyguard
Test: Swipe up and to the left on keyguard
Dmitry Dementyev [Wed, 4 Apr 2018 17:56:16 +0000 (10:56 -0700)]
Merge "Remove deprecated RecoveryController API." into pi-dev
am:
ce70473a89
Change-Id: I516537e788ea873cd85d58348897d386b8bd5a5d
Bill Yi [Wed, 4 Apr 2018 12:18:57 +0000 (05:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I23a479107398d99cff9327fbe8f897bd0d6b0528
Dmitry Dementyev [Wed, 4 Apr 2018 17:42:11 +0000 (17:42 +0000)]
Merge "Remove deprecated recoverable keystore classes." into pi-dev
Dmitry Dementyev [Wed, 4 Apr 2018 17:41:51 +0000 (17:41 +0000)]
Merge "Remove deprecated RecoveryController API." into pi-dev
David Brazdil [Wed, 4 Apr 2018 17:37:14 +0000 (10:37 -0700)]
Merge "Move hidden API from vendor to light grey" into pi-dev
am:
b622906dc5
Change-Id: I33b7b4afd232eb305fdb1dac42d7b8980ea1cbd6
Bill Yi [Wed, 4 Apr 2018 17:33:28 +0000 (10:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ifbca808c357b04b1c5cf25b6cc1852f447c221a5
Winson Chung [Wed, 4 Apr 2018 17:28:59 +0000 (10:28 -0700)]
Merge "Revert "Nav icons and quick step states are determined by service enabled"" into pi-dev
am:
b4da14cde9
Change-Id: I1eb26e9d51d35bc7eca7bf9244ae7861f2e47c1f
David Brazdil [Wed, 4 Apr 2018 17:23:30 +0000 (17:23 +0000)]
Merge "Move hidden API from vendor to light grey" into pi-dev
Pavel Maltsev [Wed, 4 Apr 2018 17:15:10 +0000 (10:15 -0700)]
Merge "Add hasUnwantedCapability method" into pi-dev
am:
c5138d2697
Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b
Benedict Wong [Wed, 4 Apr 2018 17:14:46 +0000 (17:14 +0000)]
Merge "Force creation of Socket upon Transform application"
Lorenzo Colitti [Wed, 4 Apr 2018 17:09:54 +0000 (10:09 -0700)]
Merge "Mark networks with OEM_PAID always restricted" into pi-dev
am:
c4020ffcab
Change-Id: I3fe4d11eec36eb20b44a8fdd2489b5fcdd144dff
Winson Chung [Wed, 4 Apr 2018 17:01:47 +0000 (17:01 +0000)]
Merge "Revert "Nav icons and quick step states are determined by service enabled"" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 16:55:14 +0000 (16:55 +0000)]
Merge "Add hasUnwantedCapability method" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 16:54:46 +0000 (16:54 +0000)]
Merge "Mark networks with OEM_PAID always restricted" into pi-dev
Julia Reynolds [Wed, 4 Apr 2018 16:38:20 +0000 (09:38 -0700)]
Merge "Ignore test" into pi-dev
am:
de3569ef84
Change-Id: I2e489c20b5d108af5aaa82fb63bed6350c155826
Julia Reynolds [Wed, 4 Apr 2018 16:28:45 +0000 (16:28 +0000)]
Merge "Ignore test" into pi-dev
Ryan Mitchell [Mon, 26 Mar 2018 18:05:31 +0000 (11:05 -0700)]
Check the size of the strings in the StringPool before flattening.
Test: Tested for normal functionality when string does not exceed
maximum length and tests for detection of string that is too lonhg for
UTF8i
Bug: b/
74176037
Change-Id: Ic71d3671a069e7012e8ca107e79e071499eebbf6
(cherry picked from commit
a15c2a8957b9883cb293fdacaeabd7f2e037a0a5)
Andreas Gampe [Wed, 4 Apr 2018 15:17:08 +0000 (08:17 -0700)]
[automerger skipped] Merge "Frameworks: In the kill handler, ensure the logging handler was run" into pi-dev
am:
a926126a8b -s ours
Change-Id: If9ce1eb81ef4b652727f098d1425442571656283
Winson Chung [Wed, 4 Apr 2018 15:16:00 +0000 (15:16 +0000)]
Revert "Nav icons and quick step states are determined by service enabled"
This reverts commit
8a7c97a16d7cfa7bcc602dfa969370bce9dfb686.
Reason for revert: b/
77566214
Bug:
77566214
Change-Id: Iba3ef20a304e3a47f1affe0b38598c7d7f0daef7
TreeHugger Robot [Wed, 4 Apr 2018 15:04:37 +0000 (15:04 +0000)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run" into pi-dev
Stephen [Tue, 3 Apr 2018 20:12:01 +0000 (13:12 -0700)]
Adding methods to greylist
Test: None
bug:
74066078
Change-Id: Ic84f4374c8b7c0b359c8674558b89a7a370cc1d0
Julia Reynolds [Wed, 4 Apr 2018 13:45:15 +0000 (09:45 -0400)]
Ignore test
That is failing on virtual devices
Test: presubmit
Bug:
77570224
Change-Id: I333ecab616c9528b89a91071416794dc96b479c4
Evan Laird [Wed, 4 Apr 2018 13:57:27 +0000 (06:57 -0700)]
Merge "Fix icon tinting when in split screen" into pi-dev
am:
2edaf6244c
Change-Id: Id7e3fa40eae27514ccf247545cb2e6f40c13c412
TreeHugger Robot [Wed, 4 Apr 2018 13:42:10 +0000 (13:42 +0000)]
Merge "Fix icon tinting when in split screen" into pi-dev
Jorim Jaggi [Wed, 4 Apr 2018 13:34:01 +0000 (06:34 -0700)]
Only set client hidden if both hidden and hiddenRequested
am:
752cd826b9
Change-Id: I490c1b0a0ee995511c6ac0f657c587055225a73a
David Brazdil [Wed, 4 Apr 2018 13:25:00 +0000 (14:25 +0100)]
Move hidden API from vendor to light grey
Bug:
64382372
Bug:
77328929
Test: make
Change-Id: I5141b56c79fad2bc6943ca6086eae53cad82d09c
Jorim Jaggi [Wed, 4 Apr 2018 13:25:59 +0000 (06:25 -0700)]
Merge "Add launch hint for RecentsAnimation" into pi-dev
am:
0859b46d9d
Change-Id: I549a9c59eafcfce68e70ed5081fb9a487d181d92
Jorim Jaggi [Thu, 29 Mar 2018 14:29:18 +0000 (16:29 +0200)]
Only set client hidden if both hidden and hiddenRequested
This fixes a bug where clientHidden of Launcher was set to true
too early because of the following flow:
- Open app, then press home
- During the transition relaunch the app
This leads to a new transition being started for which
hiddenRequested=true for Launcher. Then, the old animation
finishes, before the new one gets stared, and Launcher gets client
hidden too early.
More generally this is correct because:
- if (hidden && hiddenRequested) both states agree
- if (!hidden && !hiddenRequested) both states agree as well
- if (hidden && !hiddenRequested): App is becoming visible before
transition has started, so we shouldn't set it to client hidden
- if (!hidden && hiddenRequested): App is becoming invisible before
transition has started. However we need to defer client hidden
until the transition is done.
Bug:
74220420
Test: Open/close apps quickly repeatedly
Test: go/wm-smoke
Change-Id: I6df107fb0be9d2d779c997f0ddf1315bf53d27a5
Jorim Jaggi [Wed, 4 Apr 2018 13:16:37 +0000 (13:16 +0000)]
Merge "Add launch hint for RecentsAnimation" into pi-dev
Jorim Jaggi [Wed, 4 Apr 2018 13:12:28 +0000 (06:12 -0700)]
Merge "Update non-remote wallpaper anim to spec" into pi-dev
am:
269fc17510
Change-Id: I6322fc3fc222adade3829e396554a210b0286bc9
Jorim Jaggi [Wed, 4 Apr 2018 13:03:33 +0000 (13:03 +0000)]
Merge "Update non-remote wallpaper anim to spec" into pi-dev
Jorim Jaggi [Thu, 22 Mar 2018 22:20:36 +0000 (23:20 +0100)]
Add launch hint for RecentsAnimation
We are starting an activity, so let's send launch hint to be
faster and consistent with other activity launches.
Test: Swipe up, check android.hardware.power in systrace
Bug:
73651529
Change-Id: Ia8f925d94cf6969d2501e00b86fa91617d093916
Abodunrinwa Toki [Tue, 3 Apr 2018 22:49:16 +0000 (23:49 +0100)]
Fix TCS crash due to API changes.
- Brings by old deleted APIs and hides them
- Except parceling and hidden APIs that won't have been called anyway
- Option holds a reference to the Request object so we don't have to
rebuild it
Bug:
77523413
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextSelectionTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextLinksTest
Change-Id: I4277c48a950c3334439649373885ed7fe54f898e
Tony Mak [Wed, 4 Apr 2018 10:51:20 +0000 (03:51 -0700)]
We should show custom title for suspend app dialog
am:
706fbe7ed3
Change-Id: I59ca1b40ad78d6760724ea8d5297fe5cdccafc50
Tony Mak [Tue, 3 Apr 2018 17:49:05 +0000 (18:49 +0100)]
We should show custom title for suspend app dialog
BUG:
77523074
Test: Suspend an app, observe the new title.
Change-Id: I85f3d47e05332f7593a885130fd30dc5fd0a9960
Aseem Kumar [Wed, 4 Apr 2018 06:15:17 +0000 (23:15 -0700)]
Merge "Throw ServiceSpecificException if calling app tries to initialize certificates with lower version. Earlier, the code just returned silently, giving no indication that updating certs failed." into pi-dev
am:
b2e6e45d00
Change-Id: Ie67aad45f125f5b33219e536753698a0892b5ed0
TreeHugger Robot [Wed, 4 Apr 2018 06:03:23 +0000 (06:03 +0000)]
Merge "Throw ServiceSpecificException if calling app tries to initialize certificates with lower version. Earlier, the code just returned silently, giving no indication that updating certs failed." into pi-dev
Chen Xu [Wed, 4 Apr 2018 05:46:34 +0000 (22:46 -0700)]
[automerger skipped] Merge "throw runtimeException for applicable TM APIs" am:
63437f247b
am:
5a3c02ea22 -s ours
Change-Id: If6cf8231882da5d0b2ea481d2e8f3e3aaf2f9118
Lorenzo Colitti [Fri, 30 Mar 2018 09:21:27 +0000 (09:21 +0000)]
Mark networks with OEM_PAID always restricted
Bug:
68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Cherry-picked from AOSP with no conflicts
Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit
efbacc0ccb70917b2782272e6b8f1a0fb3f56cbe)
Chen Xu [Wed, 4 Apr 2018 04:52:13 +0000 (21:52 -0700)]
Merge "throw runtimeException for applicable TM APIs"
am:
63437f247b
Change-Id: I3d0bcc477917c2fe27bf8024190d0f1bbd2fa585
Mathieu Chartier [Wed, 4 Apr 2018 04:52:12 +0000 (21:52 -0700)]
[automerger skipped] Merge "Add dedicated flag to control app image generation" am:
abf1476dbe
am:
21a2f48a0d -s ours
Change-Id: Ia9dee120bc2f79e1705064e43de6736fa1b57d48
Phil Weaver [Sat, 31 Mar 2018 00:52:34 +0000 (17:52 -0700)]
Don't clear a11y focus with lock held
The bug I'm fixing is kind of weird, but in the trace it
showed lock contention with onWindowsForAccessibilityChanged
holding the lock for a long time. So I've cleaned up that
method a bit, looking for trouble. The only concrete thing
I see that's wrong is that I was clearing a11y focus, which
involves calling the app that last reported having focus.
That was done with the lock held. Now doing it through the
handler.
Bug:
77298850
Test: Ran a11y CTS and unit tests.
Change-Id: I667707412a0e3ba98639d0cb43858e8c6b52a5a7
Mathieu Chartier [Wed, 4 Apr 2018 03:57:41 +0000 (20:57 -0700)]
Merge "Add dedicated flag to control app image generation"
am:
abf1476dbe
Change-Id: If1047435f3b74443e2508a265500acf4ed1c7b53
Lucas Dupin [Wed, 4 Apr 2018 03:54:00 +0000 (20:54 -0700)]
Merge "Do not animate power menu when AOD" into pi-dev
am:
f0e74ae8ac
Change-Id: Idbe847b130420b80fd9a9b324670e7b29c7f5df6
Hongwei Wang [Wed, 4 Apr 2018 03:36:36 +0000 (20:36 -0700)]
Merge "Adds comment how to deal with newly added audio usage" into pi-dev
am:
3eaf39f3d0
Change-Id: Icc62373b9d9c5fcd2212ddad1360df117d7cbd1f
Lucas Dupin [Wed, 4 Apr 2018 03:33:05 +0000 (03:33 +0000)]
Merge "Do not animate power menu when AOD" into pi-dev
David Chen [Wed, 4 Apr 2018 03:31:42 +0000 (20:31 -0700)]
Merge "Includes annotations with statsd reports." into pi-dev
am:
b61f80b42b
Change-Id: I0ec92b7e372617a4f45cf2ed22fbbe6b5ced8cbd
Felipe Leme [Wed, 4 Apr 2018 03:21:42 +0000 (20:21 -0700)]
Merge "Removed redundant autofill response info from ViewState dump()" into pi-dev
am:
dc4309544d
Change-Id: Ia781373c09d1b07b3a475685d88a326bd840ab62