OSDN Git Service
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 [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
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
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
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
Chen Xu [Wed, 4 Apr 2018 03:17:39 +0000 (03:17 +0000)]
Merge "throw runtimeException for applicable TM APIs"
Remi NGUYEN VAN [Wed, 4 Apr 2018 03:17:22 +0000 (20:17 -0700)]
Merge "Add settings to configure default multipath quota." into pi-dev
am:
9ab1da2052
Change-Id: I01e25079def030c43b0800d610590a3a6a5ac1be
Pankaj Kanwar [Wed, 4 Apr 2018 03:13:05 +0000 (20:13 -0700)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" into pi-dev
am:
d40c477b2e
Change-Id: Ie262a70023f4269f34c256d3040b0f3543c3d504
TreeHugger Robot [Wed, 4 Apr 2018 03:03:48 +0000 (03:03 +0000)]
Merge "Adds comment how to deal with newly added audio usage" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 02:50:32 +0000 (02:50 +0000)]
Merge "Includes annotations with statsd reports." into pi-dev
Kevin Chyn [Wed, 4 Apr 2018 02:44:12 +0000 (19:44 -0700)]
Merge "Fix fingerprint dialog icon color" into pi-dev
am:
7c97601a43
Change-Id: I2e6fd42656d56b91a18f030d18f70c7b81081b01
Andrii Kulian [Wed, 4 Apr 2018 02:39:28 +0000 (19:39 -0700)]
Merge "Prevent exception when stack being removed on crash" into pi-dev
am:
6acf543681
Change-Id: I0e40a2835f5b66e557235f7cfbe2537a03763d1a
Lucas Dupin [Wed, 4 Apr 2018 02:36:21 +0000 (19:36 -0700)]
Merge "Separator width" into pi-dev
am:
a24ddf58c9
Change-Id: I91975ffdf757071a86cadd9f5e3a7f141089f86f
Erik Kline [Wed, 4 Apr 2018 02:33:34 +0000 (19:33 -0700)]
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev
am:
2bad006b0d -s ours
Change-Id: I5146ae845469b81dc0aec6838d55be4a33c670ad
Evan Rosky [Wed, 4 Apr 2018 02:17:33 +0000 (19:17 -0700)]
Merge "Use client-side version of inTouchMode" into pi-dev
am:
3ec4b8ccfd
Change-Id: If4fb112a4a8683dc99a5f82ee376b18c6323bf7c
Mathieu Chartier [Wed, 4 Apr 2018 02:14:51 +0000 (02:14 +0000)]
Merge "Add dedicated flag to control app image generation"
Eugene Susla [Wed, 4 Apr 2018 02:05:50 +0000 (19:05 -0700)]
Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev
am:
7694926d37
Change-Id: Idf599502f5f85f902c62e31432323b7ad56a4715
Patrick Baumann [Wed, 4 Apr 2018 02:00:14 +0000 (19:00 -0700)]
Merge "Bind to DefaultContainerService early for AIA" into pi-dev
am:
68e89707f4
Change-Id: Ie195af063b6f94c807e507e76bfbc891fef558b4
Phil Weaver [Wed, 4 Apr 2018 01:57:01 +0000 (18:57 -0700)]
Merge "Move cts tests using reflection" into pi-dev
am:
fd533c751b
Change-Id: Ib6cb9a5e24e1faa93d66ae0511e281510fb70b57
Julia Reynolds [Wed, 4 Apr 2018 01:54:09 +0000 (18:54 -0700)]
Merge "Show ripple on toggle" into pi-dev
am:
1d75ae7476
Change-Id: I5ab0afe655e04fc5be9d0cd0ca64c260a9864d73
TreeHugger Robot [Wed, 4 Apr 2018 01:53:57 +0000 (01:53 +0000)]
Merge "Removed redundant autofill response info from ViewState dump()" into pi-dev
Mike Ma [Wed, 4 Apr 2018 01:51:08 +0000 (18:51 -0700)]
Merge "Register broadcast receiver at runtime instead" into pi-dev
am:
806be6b602
Change-Id: I3375ae095ef08830ea1892c3652832d17308340d
Julia Reynolds [Wed, 4 Apr 2018 01:41:38 +0000 (18:41 -0700)]
Merge "Ensure that the blocking helper will run" into pi-dev
am:
f3fa01e805
Change-Id: Idd21b7ddb72e140debfe5d0f926425a5549a9847
fionaxu [Fri, 23 Mar 2018 18:52:44 +0000 (11:52 -0700)]
throw runtimeException for applicable TM APIs
1. This CL revert some API change from ag/
3710629.
2. throw runtime exception when running in a non-1000 UID.
3. throw for methods that persist some sort of state and readers could continue to
return placeholder values.
4. for rest of TelephonyManager API cleanup b/
74401420.
Bug:
74016743
Test: Build
Change-Id: I2846efc11eebce4a923762f56f09daaf37c44763
(cherry picked from commit
f20f0d916f2326bee618600119107da1a8ae15a8)
Merged-in: I2846efc11eebce4a923762f56f09daaf37c44763
Remi NGUYEN VAN [Wed, 4 Apr 2018 01:23:42 +0000 (01:23 +0000)]
Merge "Add settings to configure default multipath quota." into pi-dev
Pankaj Kanwar [Wed, 4 Apr 2018 01:21:17 +0000 (01:21 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" into pi-dev
Kevin Chyn [Wed, 4 Apr 2018 01:21:13 +0000 (01:21 +0000)]
Merge "Fix fingerprint dialog icon color" into pi-dev
David Chen [Fri, 30 Mar 2018 22:14:04 +0000 (15:14 -0700)]
Includes annotations with statsd reports.
It's tricky to determine the source of the metrics on a device
currently since we can take the union of multiple configs and send
only one giant statsd_config into statsd. We will use the int64 field
to track the sub config id's and the int32 field to track the version
for each sub config, but the fields are named more generically as
annotations.
The annotations are available in both the reports and metadata.
Test: Check that all unit-tests pass on marlin-eng
Bug:
77327261
Change-Id: Ic37c549c8b2991676f69948c515156765c9f5108
Andrii Kulian [Wed, 4 Apr 2018 00:32:10 +0000 (00:32 +0000)]
Merge "Prevent exception when stack being removed on crash" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 00:14:54 +0000 (00:14 +0000)]
Merge "Separator width" into pi-dev
Matthew Ng [Wed, 4 Apr 2018 00:02:07 +0000 (17:02 -0700)]
Merge "Added two touch slops for easier home press (1/3)" into pi-dev
am:
e81e6faf08
Change-Id: I1e60584781c7ba7dfa2c301f9da2cfd9cad14ae9
Winson Chung [Tue, 3 Apr 2018 23:58:05 +0000 (16:58 -0700)]
Merge changes from topic "fw_quickstep_update" into pi-dev
am:
5fa07c0986
Change-Id: Ic6b6991106fe021a178b3af4328d5fd81287649c
Winson Chung [Tue, 3 Apr 2018 23:53:49 +0000 (16:53 -0700)]
Allow recents animation to override divider minimized state
am:
f557c3b565
Change-Id: Iff052805a63517f8cd1bd72172f4caecc955991b
Kevin Chyn [Fri, 30 Mar 2018 19:36:32 +0000 (12:36 -0700)]
Fix fingerprint dialog icon color
The Keyguard resource has 50% opacity on the "ridges" assets but 100% on
the "error" assets, making it very difficult to fix/animate correctly in
both Keyguard and FingerprintDialogView. This change decouples the
FingerprintDialogView from the Keyguard resource.
Fixes:
75290621
Test: manual test with FingerprintDialog APK
visually inspect colors/animations
Change-Id: Ie04c706e24e129f01b6ddb500c689f108c41ae3e
Winson Chung [Tue, 3 Apr 2018 23:49:41 +0000 (16:49 -0700)]
Prevent unnecessary reordering of the home stack
am:
6a38fca2d8
Change-Id: I7072889d61b0e0123c09397ba30d19d194a44f47
TreeHugger Robot [Tue, 3 Apr 2018 23:47:23 +0000 (23:47 +0000)]
Merge "Support bypassing TLS in the framework" into pi-dev
Makoto Onuki [Tue, 3 Apr 2018 23:43:42 +0000 (16:43 -0700)]
Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev
am:
1c3e76b10e
Change-Id: I07842999e4514dc46fab4dc53e3bed583425801f
Julia Reynolds [Tue, 3 Apr 2018 23:39:52 +0000 (16:39 -0700)]
Merge "Add method to get blocked channel counts" into pi-dev
am:
7065aedba0
Change-Id: Id680cde8e07ac9dc18df40ddeb21b890362510b6
Tony Mak [Tue, 3 Apr 2018 23:36:40 +0000 (16:36 -0700)]
Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev
am:
f01e2024d2
Change-Id: If8d0b96d3e0e20c3a890457e9b91a117c5cfaaac
Salvador Martinez [Tue, 3 Apr 2018 23:33:39 +0000 (16:33 -0700)]
Merge "Update notification to allow multiline text" into pi-dev
am:
a2117ce057
Change-Id: Ib20d0731f001702a2918cfa880511e13ed5e3892
Julia Reynolds [Tue, 3 Apr 2018 23:30:35 +0000 (16:30 -0700)]
Merge "Only tag foreground notifications" into pi-dev
am:
59831cbec7
Change-Id: Ia986859e678cdb7bd58664dbb4eaeb1b9260b423
Lucas Dupin [Tue, 3 Apr 2018 23:27:23 +0000 (16:27 -0700)]
Merge "Longer wake lock timeout" into pi-dev
am:
315c230cbb
Change-Id: Iff75a7f4c2d0c0051242e640116db21855c1471a
TreeHugger Robot [Tue, 3 Apr 2018 23:25:34 +0000 (23:25 +0000)]
Merge "Use client-side version of inTouchMode" into pi-dev
Kenny Guy [Tue, 3 Apr 2018 23:24:26 +0000 (16:24 -0700)]
Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev
am:
a43cedbf25
Change-Id: Ia06d7cb7a5585a3f0865cb3500e48a4f02b082ea
Hongwei Wang [Tue, 3 Apr 2018 23:22:06 +0000 (16:22 -0700)]
Adds comment how to deal with newly added audio usage
Bug:
77547740
Test: adb shell dumpsys media.audio_policy
Change-Id: If0d9f1d0ac2205900532cb9f761746ce4d164d32
Brad Stenning [Tue, 3 Apr 2018 23:21:33 +0000 (16:21 -0700)]
Merge "Update displayId when a window is moved to a new display" into pi-dev
am:
32e7a0c23b
Change-Id: I659d556f9eaa4e614951c17b81f6a98b04374d44
Jean-Michel Trivi [Tue, 3 Apr 2018 23:18:29 +0000 (16:18 -0700)]
Merge "AudioService: prevent muting of alarm / accessibility" into pi-dev
am:
04dc4a02f0
Change-Id: I3d40358182ab499bcd149dc4859b9b37c00a04ed
TreeHugger Robot [Tue, 3 Apr 2018 23:17:26 +0000 (23:17 +0000)]
Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev
Todd Kennedy [Tue, 3 Apr 2018 23:15:30 +0000 (16:15 -0700)]
Merge "Correct provider filtering" into pi-dev
am:
b8d46c2c14
Change-Id: I61530f694443e56e6115e5ca7c18063cb1bd9024
TreeHugger Robot [Tue, 3 Apr 2018 23:15:19 +0000 (23:15 +0000)]
Merge "Bind to DefaultContainerService early for AIA" into pi-dev
Maggie Wang [Tue, 3 Apr 2018 23:12:20 +0000 (16:12 -0700)]
Merge "Fix test location provider bug" into pi-dev
am:
4f79a18cc5
Change-Id: I1f9bc8a7e1c750c6f24ec4a6fee93e976b014ce2
Steve Pfetsch [Tue, 3 Apr 2018 23:09:21 +0000 (16:09 -0700)]
Merge "Relax angle-related false touch classification." into pi-dev
am:
7f3e5bb053
Change-Id: I50cfd5c0caef979479f6880b163317261c57c997
TreeHugger Robot [Tue, 3 Apr 2018 23:07:34 +0000 (23:07 +0000)]
Merge "Move cts tests using reflection" into pi-dev
Yi Jin [Tue, 3 Apr 2018 23:06:16 +0000 (16:06 -0700)]
Merge "Based on the discussion of ag/
3818243, this is the initial list. The reason to repropose this is because of some changes like ag/
3619568. We don't want to allow this happens again." into pi-dev
am:
7d1357723d
Change-Id: I686fd6899993395e722713bc06f0bdd4ff2db8c1
Amin Shaikh [Tue, 3 Apr 2018 23:03:13 +0000 (16:03 -0700)]
Merge "Dejank QS edit screen." into pi-dev
am:
61b93505ba
Change-Id: Idd9b8e95f38f9e92211b2e8796add48d3383e4b5
Tej Singh [Tue, 3 Apr 2018 23:00:08 +0000 (16:00 -0700)]
Merge "Atoms: remove bluetooth a2dp" into pi-dev
am:
287fec6358
Change-Id: Iab0fda3de65619705a072d0e0524f7e6882f7d4a
Evan Laird [Tue, 3 Apr 2018 22:57:15 +0000 (15:57 -0700)]
Merge "Add DISABLE_CLOCK flags to status bar, fix transitions" into pi-dev
am:
02327e4080
Change-Id: I6d0f715069cac9d85b661134113d98b9b7a55d19
Julia Reynolds [Tue, 3 Apr 2018 22:53:11 +0000 (22:53 +0000)]
Merge "Show ripple on toggle" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 22:50:14 +0000 (22:50 +0000)]
Merge "Register broadcast receiver at runtime instead" into pi-dev
Julia Reynolds [Tue, 3 Apr 2018 22:48:05 +0000 (22:48 +0000)]
Merge "Ensure that the blocking helper will run" into pi-dev
Lujiang Xue [Tue, 3 Apr 2018 22:37:46 +0000 (15:37 -0700)]
Merge "null check on qspanel before called method on it." into pi-dev
am:
cbea0a76c6
Change-Id: Ie4a86247d2134271bb4211e87876a4a597b52288
Mathieu Chartier [Tue, 13 Mar 2018 00:11:07 +0000 (17:11 -0700)]
Add dedicated flag to control app image generation
Also disable the flag for split APKs.
Bug:
72696798
Test: manual
(cherry picked from commit
a9c343386d5505d7111aee3c1ffec409c9730f21)
Merged-In: I25007500e221744a218b165dde41ca9db19b1832
Change-Id: I1dc3137307834d948b52af18205ca47dc8dc7e67
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Support bypassing TLS in the framework
This change comprises the following parts:
[1] android.net.dns.ResolvUtil, containing methods that encapsulate the
use of the high bit in netids used in DNS resolution contexts.
[2] Updates to captive portal apps to call the ResolvUtil method that
enables DNS-over-TLS bypass for the captive portal app process.
Test: as follows
- builds
- flashes
- boots
- runtest frameworks-net passes
Bug:
64133961
Bug:
72345192
Merged-In: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513
Merged-In: I4c49e23d8caa4d485df1c1d2f135a7282d439c0b
Change-Id: I2072c1f68d6978fa0d7e9d8693135a2c51bb0f87
(cherry picked from commit
2140529d9b8e116d88c2a385a0b3179c2ede5ad7)
TreeHugger Robot [Tue, 3 Apr 2018 22:31:57 +0000 (22:31 +0000)]
Merge "Added two touch slops for easier home press (1/3)" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 22:31:57 +0000 (22:31 +0000)]
Merge changes from topic "fw_quickstep_update" into pi-dev
* changes:
Reparent recents animation task leash to app animation layer
Allow recents animation to override divider minimized state
Prevent unnecessary reordering of the home stack
Ricky Wai [Tue, 3 Apr 2018 22:29:39 +0000 (15:29 -0700)]
Merge "Handle getNetworkWatchlistConfigHash() without config case" into pi-dev
am:
16ae4cd2ef
Change-Id: I246ff36bb9d04a2b013ce17bff236c9ab3df3218
Makoto Onuki [Tue, 3 Apr 2018 22:25:37 +0000 (22:25 +0000)]
Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 22:22:24 +0000 (22:22 +0000)]
Merge "Add method to get blocked channel counts" into pi-dev
Ruchi Kandoi [Tue, 3 Apr 2018 22:21:33 +0000 (15:21 -0700)]
Merge changes from topic "omapi" into pi-dev
am:
a1fc0255b8
Change-Id: I3a01cf7aeef6eccfff761ef6c4d27c52c2aab913
Matthew Ng [Tue, 3 Apr 2018 22:13:57 +0000 (15:13 -0700)]
Merge "Avoids vibration over deadzone in navigationbar" into pi-dev
am:
47721fa59d
Change-Id: I03234c8596e7214911bf69a7d37066dd29eacb8d
TreeHugger Robot [Tue, 3 Apr 2018 22:12:18 +0000 (22:12 +0000)]
Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev
Fan Zhang [Tue, 3 Apr 2018 22:04:47 +0000 (15:04 -0700)]
Merge "Add logging constant to track settings slice changes" into pi-dev
am:
7793bcd867
Change-Id: Idcd96ffa39088f51f87923bc52ba2133ed2017bd
Matthew Ng [Tue, 3 Apr 2018 21:58:29 +0000 (14:58 -0700)]
Merge "Nav icons and quick step states are determined by service enabled" into pi-dev
am:
6ae58e0d16
Change-Id: Ia392cc6ff8d1e39daf65f9594e575292ba57ed91
TreeHugger Robot [Tue, 3 Apr 2018 21:54:31 +0000 (21:54 +0000)]
Merge "Update notification to allow multiline text" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 21:52:17 +0000 (21:52 +0000)]
Merge "Only tag foreground notifications" into pi-dev
Derek Sollenberger [Tue, 3 Apr 2018 21:50:29 +0000 (14:50 -0700)]
Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev
am:
26f99b4cb7
Change-Id: I70ba8e5cda90bd468e47ceb7be8d51edab839cf5
Nathan Harold [Tue, 3 Apr 2018 21:41:56 +0000 (14:41 -0700)]
Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
am:
80a2bba9a6
Change-Id: Icd1b2cfc699ab44e4ca536b98298d5b23db7372e
Eugene Susla [Mon, 26 Feb 2018 18:41:28 +0000 (10:41 -0800)]
[DO NOT MERGE] Sort A11yService#getWindows by layer descending
This is what A11yService#getWindows promises in the javadoc.
Fixes:
71581072
Test: using testback ensure the order is correct
Change-Id: I5038c4de29c60e235b65751f7bd7771ef35eb339
(cherry picked from commit
f40da1a884493b6af61e3b978fdf7c7ff059b2dc)
Erik Kline [Tue, 3 Apr 2018 21:26:39 +0000 (14:26 -0700)]
Merge "Support bypassing TLS in the framework" am:
aef9956de2
am:
f12b9edf24
Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513
Lucas Dupin [Tue, 3 Apr 2018 21:23:52 +0000 (14:23 -0700)]
Separator width
Test: visual
Change-Id: I5bcac302d8b0c6648c0c75bf9671c09543d1c826
Fixes:
77540159
TreeHugger Robot [Tue, 3 Apr 2018 21:23:35 +0000 (21:23 +0000)]
Merge "Longer wake lock timeout" into pi-dev
Erik Kline [Tue, 3 Apr 2018 21:17:23 +0000 (14:17 -0700)]
Merge "Support bypassing TLS in the framework"
am:
aef9956de2
Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595
TreeHugger Robot [Tue, 3 Apr 2018 21:15:26 +0000 (21:15 +0000)]
Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 21:06:39 +0000 (21:06 +0000)]
Merge "Update displayId when a window is moved to a new display" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 21:06:15 +0000 (21:06 +0000)]
Merge "AudioService: prevent muting of alarm / accessibility" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 20:53:21 +0000 (20:53 +0000)]
Merge "Correct provider filtering" into pi-dev
Android Build Merger (Role) [Tue, 3 Apr 2018 20:44:42 +0000 (20:44 +0000)]
Merge "Merge "Change signature of requestBluetoothAudio" into pi-dev am:
0929182dbf" into pi-dev-plus-aosp
OSDN Git Service
