OSDN Git Service
Fyodor Kupolov [Thu, 22 Jun 2017 15:47:58 +0000 (15:47 +0000)]
Merge "Purge user data on ACTION_USER_REMOVED"
TreeHugger Robot [Thu, 22 Jun 2017 15:37:44 +0000 (15:37 +0000)]
Merge "Pass all locale information down to Minikin"
Juan Lang [Thu, 22 Jun 2017 14:35:41 +0000 (14:35 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev am:
f5d8628779
am:
1911226ba2 -s ours
Change-Id: I347d9a78fd5cc00b9f47b2331b7ecb750c38eeda
Erik Kline [Thu, 22 Jun 2017 14:32:55 +0000 (14:32 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours am:
caafb1fbe3 -s ours
am:
09bd349962 -s ours
Change-Id: I3796c1f776101e6d2d236a13a2375a19bd7df158
Felipe Leme [Thu, 22 Jun 2017 14:30:10 +0000 (14:30 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28 am:
17911ae02b
am:
e7e3f0657b
Change-Id: I7792d514d44ebece52bf06f319a54181801afb29
Android Build Merger (Role) [Thu, 22 Jun 2017 14:23:01 +0000 (14:23 +0000)]
Merge "Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp am:
e8ac390ae3"
Amith Yamasani [Thu, 22 Jun 2017 14:21:16 +0000 (14:21 +0000)]
Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp
am:
e8ac390ae3
Change-Id: Id29bcd5ba1c41f724934232000f9acae96f722ca
Android Build Merger (Role) [Thu, 22 Jun 2017 14:20:39 +0000 (14:20 +0000)]
Merge "Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp am:
eec4ffbee6"
Pavel Grafov [Thu, 22 Jun 2017 14:19:20 +0000 (14:19 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp
am:
eec4ffbee6
Change-Id: I4013274e2f00e16ab26b7d924233facec383b7db
Android Build Merger (Role) [Thu, 22 Jun 2017 14:18:36 +0000 (14:18 +0000)]
Merge "Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp am:
6d0533da4e"
Tomasz Wasilczyk [Thu, 22 Jun 2017 14:17:54 +0000 (14:17 +0000)]
Merge "Adjust log messages emitted by RadioService."
Juan Lang [Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
am:
f5d8628779
Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e
Rob Carr [Thu, 22 Jun 2017 14:16:16 +0000 (14:16 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
am:
6d0533da4e
Change-Id: Id75687f78928dc11adab77559f5d4fa562e5f3a7
Pavel Grafov [Thu, 22 Jun 2017 14:13:28 +0000 (14:13 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
am:
efaf14102f
Change-Id: I5120d979c04d792b1bd57ad0d731f0e2fbab3349
Rob Carr [Thu, 22 Jun 2017 14:10:15 +0000 (14:10 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
am:
6f6f9383b8
Change-Id: Ic021a5ed26b009b9feaab83ef8770d2740fd6099
Bill Yi [Thu, 22 Jun 2017 14:07:19 +0000 (14:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
am:
67a43ea494 -s ours
Change-Id: Ie84a3d3d574143fb5448f3e0380454c52cd93d59
Erik Kline [Thu, 22 Jun 2017 14:06:59 +0000 (14:06 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
caafb1fbe3 -s ours
Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
Felipe Leme [Thu, 22 Jun 2017 14:04:27 +0000 (14:04 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
17911ae02b
Change-Id: I848c2f793706bb7223a05b989f55e4f77e31e343
Bill Yi [Thu, 22 Jun 2017 14:02:35 +0000 (14:02 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
am:
baa8af8d0d -s ours
Change-Id: I40f0e330a86e918e9712cfb4c405d8b18bf79a0f
Bill Yi [Thu, 22 Jun 2017 14:00:19 +0000 (14:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
am:
d772e224d7 -s ours
Change-Id: I5f5d80dc33aa7c379f16ca38e26064f835e2727c
Android Build Merger (Role) [Thu, 22 Jun 2017 13:59:17 +0000 (13:59 +0000)]
Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:57:54 +0000 (13:57 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
ef863368b4
Change-Id: I0663ad4be0ae6b29ea0b2f5942af518a830632b3
Bill Yi [Thu, 22 Jun 2017 13:57:43 +0000 (13:57 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
am:
7a5ba9d901 -s ours
Change-Id: I0da65f2661d2902474fb3dcbb24b30580b3f9e3b
Android Build Merger (Role) [Thu, 22 Jun 2017 13:57:27 +0000 (13:57 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp
Pavel Grafov [Thu, 22 Jun 2017 13:56:15 +0000 (13:56 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
fcc7a55558
Change-Id: Ica390ce4fe72b205c89b269f7f3d050d1c27511d
Android Build Merger (Role) [Thu, 22 Jun 2017 13:55:48 +0000 (13:55 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 22 Jun 2017 13:55:23 +0000 (13:55 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5 am:
024ba89606
am:
3370e44417
Change-Id: Ifa98d1d39503ab69dbd469cc1feb9bdb33c2cc84
Android Build Merger (Role) [Thu, 22 Jun 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
am:
c0af382a25 -s ours
Change-Id: I3b5e596034d8f5078dac107d754aec0f77d9ba89
Rob Carr [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
e155b7ca8e
Change-Id: I917e8ef8d9aa83261bdbeb2200464549af9c7f70
Pavel Grafov [Thu, 22 Jun 2017 13:53:26 +0000 (13:53 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
f9a63d0457
Change-Id: Iae48fe9599a680a55024c4b377f7583e7606c870
Android Build Merger (Role) [Thu, 22 Jun 2017 13:53:00 +0000 (13:53 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 13:51:45 +0000 (13:51 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
604c29006b
Change-Id: Ieea08ba5d0462bd28b185a59ab077a5f31e320cf
Felipe Leme [Thu, 22 Jun 2017 13:51:25 +0000 (13:51 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
am:
6358cdcd28
Change-Id: Ic42bd782988bec610281b651346a5809e912c823
Android Build Merger (Role) [Thu, 22 Jun 2017 13:51:19 +0000 (13:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:50:20 +0000 (13:50 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
1a588ec465 -s ours
Change-Id: Id6ea25f828e01b7e8aaf0b186718f830d111c797
Android Build Merger (Role) [Thu, 22 Jun 2017 13:49:33 +0000 (13:49 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
131ccb00a8 -s ours
Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691
Android Build Merger (Role) [Thu, 22 Jun 2017 13:48:49 +0000 (13:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:48:51 +0000 (13:48 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
am:
78f3a0f722
Change-Id: Ibc04014f224ecbc666c8296a2b25d939fbfc9921
Bill Yi [Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
70c2a7b0d9 -s ours
Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88
Bill Yi [Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
4b209f21b6 -s ours
Change-Id: I438f9ea34f83513db4d43b7c6bc0f46c13d8d712
Evan Laird [Thu, 22 Jun 2017 13:47:00 +0000 (13:47 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev am:
ca35ed5cb9
am:
53988d9f8d
Change-Id: Id5ea4fd2244ccac41302d34982f0a26f5d198804
Pavel Grafov [Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e
Evan Laird [Thu, 22 Jun 2017 13:44:31 +0000 (13:44 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5
am:
024ba89606
Change-Id: I330846d328be9e2e10631cd6ceb0296734308c23
Rob Carr [Thu, 22 Jun 2017 13:42:47 +0000 (13:42 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14
Bill Yi [Thu, 22 Jun 2017 13:39:36 +0000 (13:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164
Evan Laird [Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
am:
ca35ed5cb9
Change-Id: I0d695cc7edaeddb7817a19ff6f7e33d55691d7e0
Bill Yi [Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
TreeHugger Robot [Thu, 22 Jun 2017 13:31:40 +0000 (13:31 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 09:42:43 +0000 (09:42 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev am:
e9b908c7a6 -s ours
am:
b408e40ce2 -s ours
Change-Id: I28858f9bacca97bcc6d70860c9d5b8c358b5e7d5
Erik Kline [Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
am:
e9b908c7a6 -s ours
Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd
Erik Kline [Thu, 22 Jun 2017 09:31:03 +0000 (09:31 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit
218c226b0882640a351deb0dd945a30b8bc32fff)
(cherry picked from commit
798a93b0df76c4feb5ddd619b788f2cf9ea5bf77)
TreeHugger Robot [Thu, 22 Jun 2017 04:52:32 +0000 (04:52 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 03:58:32 +0000 (03:58 +0000)]
Merge "Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev am:
65a3b2ccc4 am:
3bf4b6f1fe"
TreeHugger Robot [Thu, 22 Jun 2017 03:55:48 +0000 (03:55 +0000)]
Merge "Always run the intent filter verifier in USER_SYSTEM"
Winson Chung [Thu, 22 Jun 2017 03:55:44 +0000 (03:55 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev am:
65a3b2ccc4
am:
3bf4b6f1fe
Change-Id: I1228208bf54897ed967956d227a40c1cb046c63f
Winson Chung [Thu, 22 Jun 2017 03:48:45 +0000 (03:48 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
am:
65a3b2ccc4
Change-Id: I576f611e4a1a6567e7cd2e80b4f5575ba99e2f4d
TreeHugger Robot [Thu, 22 Jun 2017 03:43:42 +0000 (03:43 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
Meng Wang [Thu, 22 Jun 2017 03:35:45 +0000 (03:35 +0000)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370} am:
1b7ff89852
am:
dcc8d1566d
Change-Id: I615367219830db098c6cc2e77b90edfeec1c73b5
Meng Wang [Thu, 22 Jun 2017 03:29:11 +0000 (03:29 +0000)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
am:
1b7ff89852
Change-Id: I3bf10404abc67b4f0284ee78cb4b63c1bd17cc5a
TreeHugger Robot [Thu, 22 Jun 2017 03:11:17 +0000 (03:11 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
TreeHugger Robot [Thu, 22 Jun 2017 02:54:26 +0000 (02:54 +0000)]
Merge "Add additional tests for Algiers and Ceuta timezones"
Erik Kline [Wed, 26 Apr 2017 02:11:07 +0000 (11:11 +0900)]
Refactor TISM add/remove code
This de-duplicates all the TISM adding and teardown code.
It does not yet change the locking or threading semantics.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- manual tethering of WiFi and USB start normally
Bug:
32163131
Bug:
36216864
Bug:
62343300
Merged-In: I8ed82272183022a0469011a1f993704ecf771e3f
Merged-In: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
Merged-In: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
Change-Id: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
(cherry picked from commit
4dd9bb83e2779b309dcc7a7db389b16fa3cb05be)
TreeHugger Robot [Thu, 22 Jun 2017 01:51:11 +0000 (01:51 +0000)]
Merge "Ensure minimized state is false when dock is gone on exists change"
TreeHugger Robot [Thu, 22 Jun 2017 01:19:12 +0000 (01:19 +0000)]
Merge "AAPT2: Update the name of the configuration struct."
TreeHugger Robot [Thu, 22 Jun 2017 01:14:12 +0000 (01:14 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
Winson Chung [Tue, 20 Jun 2017 00:01:51 +0000 (17:01 -0700)]
Clean up dismiss target when last activity is unpinned.
Bug:
37309693
Test: Enter PIP, drag to show dismiss target, force kill application and
ensure target is hidden.
Change-Id: Ia41f8252e32a2ff3396796562874a6c47777030d
Felipe Leme [Thu, 22 Jun 2017 00:33:41 +0000 (17:33 -0700)]
Autofill fixes for secondary users:
- Display the SaveUI on all users.
- Dismiss the UI when switching users.
- Fix security check on disableOwnedAutofillServicesLocked()
Test: manual verification
Change-Id: I4e9167314f1feeda618db6c57735cc31d84486c1
Fixes:
62828906
Naveen Kalla [Wed, 14 Jun 2017 03:06:55 +0000 (20:06 -0700)]
Add additional tests for Algiers and Ceuta timezones
Algiers should show "Central European Standard Time" and
Ceuta should show "Central European Summer Time" as per
PTCRB test 44.2.9.1.1
Bug:
62077986
Test: runtest -x f/b/p/S/t/i/s/c/a/s/u/ZoneGetterTest.java
Change-Id: Ief59835ef078f31c447d7bba58632c04865dec74
Fyodor Kupolov [Thu, 22 Jun 2017 00:45:19 +0000 (17:45 -0700)]
Purge user data on ACTION_USER_REMOVED
Bug:
62850350
Change-Id: Id2e9db53778b8616a40e6752c3b7b390af05910d
Test: manual
Juan Lang [Thu, 11 May 2017 00:04:29 +0000 (17:04 -0700)]
Add CustomDialogPreference and CustomEditTextPreference to SettingsLib.
These classes provides extends features provided by the platform's
versions to users of the support library's versions.
Test: make RunSettingsLibRoboTests
Bug:
30046624
Merged-In: I995d5755113a8fb6d2ecc2df9322ff59c8662fe4
Change-Id: I385c92762f61c8836fffd37b24a26939cc5bc864
Sungsoo Lim [Thu, 22 Jun 2017 00:11:47 +0000 (00:11 +0000)]
Merge "Restore the selected route when an app starts to make sound"
Christopher Ferris [Thu, 22 Jun 2017 00:08:29 +0000 (00:08 +0000)]
Merge "Add a common call when wrapping an app."
Tomasz Wasilczyk [Wed, 21 Jun 2017 18:58:21 +0000 (11:58 -0700)]
Adjust log messages emitted by RadioService.
Bug: b/
36863239
Test: manual
Change-Id: I36ec04462e9db0fb8477a55e7ecec6f45c5a343e
TreeHugger Robot [Wed, 21 Jun 2017 23:45:46 +0000 (23:45 +0000)]
Merge "Eliminate the inconsistency between the states of AMS and TSMS"
Shane Farmer [Wed, 21 Jun 2017 22:20:15 +0000 (15:20 -0700)]
AAPT2: Update the name of the configuration struct.
Make the Configuration struct name less ambiguous. Also ran clang-format
on the change since some lines were too long and this resulted in a
bigger diff than expected.
Test: built manually
Test: ran existing unit tests
Change-Id: I85e78041fa78d913d47a26c85ad48b05bf935a6a
TreeHugger Robot [Wed, 21 Jun 2017 23:03:04 +0000 (23:03 +0000)]
Merge "AAPT2: Split APK by ABI."
Christopher Tate [Wed, 21 Jun 2017 22:26:18 +0000 (15:26 -0700)]
Always run the intent filter verifier in USER_SYSTEM
The temporary whitelisting of the intent filter verifier was not
taking effect when an app install was applied to all users, because
the USER_ALL userid argument was not applicable downstream in the
whitelist-package-within-user code flow. The verifier is located
explicitly in the system user anyway; we do not need to try to
launch or whitelist it in a per-target-user manner.
In addition, the whitelisting operation is now synchronous to avoid
any slight race between delivery of the verification broadcast and
application of the new whitelist state.
Bug
62814249
Test: manual
Change-Id: I051277dad6c541d0aa6bcdd824ad3cce4b20b269
Evan Laird [Wed, 21 Jun 2017 22:24:36 +0000 (18:24 -0400)]
Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev
Picked up a fudge factor along a the way because of the way that the
rounded edges of oc-dr1 change the imaginary bounds of the triangle.
This should look good though.
Test: visual; runtest systemui
Change-Id: Ie79025c74bfeb136bb7f5ee7fe5604b2c12ab71e
Tomasz Wasilczyk [Wed, 21 Jun 2017 22:24:21 +0000 (22:24 +0000)]
Merge "Implement hasControl/isClosed call of ITuner."
Meng Wang [Wed, 21 Jun 2017 22:09:29 +0000 (15:09 -0700)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
Bug:
62647106
Test: make
Change-Id: I109f4b78446f96a5cb10e0fc84935ad180c9146c
Matthew Fritze [Wed, 21 Jun 2017 21:57:29 +0000 (21:57 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev am:
736ba78a6e
am:
5686fd54aa
Change-Id: Ia29b0a4debdd9867372519da732bcc1f9dea89ed
Tomasz Wasilczyk [Wed, 21 Jun 2017 21:53:16 +0000 (21:53 +0000)]
Merge "Implement HAL death monitoring."
Matthew Fritze [Wed, 21 Jun 2017 21:51:49 +0000 (21:51 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
am:
736ba78a6e
Change-Id: I2b7421274bfd657575cc58ad6a0e35fd521e25d0
Guliz Tuncay [Tue, 20 Jun 2017 00:15:40 +0000 (17:15 -0700)]
Eliminate the inconsistency between the states of AMS and TSMS
If spell checker service (SCS) is killed for some reason, TSMS
accidentally clears the internal bindings to SCS even though it does not
programmatically unbind them. When SCS is restarted, the seemingly-dead
connections are re-established but TSMS’s internal bind groups
structures do not keep track of them anymore. This results in
inconsistency between the internal data structures of activity manager
services (AMS) and TSMS. TSMS shows no bindings anymore, whereas AMS
shows there is active spell checker service connections. The fix is to
not remove a bind group at onServiceDisconnect and only set the bind
group's connected state to false.
Fixes:
37434113
Test: Manual as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. Make sure AOSP Keyboard (com.android.inputmethod.latin)
is installed.
4. adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
5. Observe that there are no bindings to spell
checker service (SCS) by running
adb shell dumpsys textservices
6. Observe that there is no connection to SCS by running
adb shell dumpsys activity services com.android.inputmethod.latin
There should be no ConnectionRecord for
AndroidSpellCheckerService
7. Run a test program that has TextView and tap on one of the
TextViews and type some text.
8. Repeat steps 5 and 6 to observe there are now bindings and
connection to SCS.
9. Kill SCS
adb shell ps -A | grep com.android.inputmethod.latin | awk '{print $2}' | xargs adb shell kill -KILL
10. Repeat steps 5 and 6 to observe that the bindings are the
same as of Step 8 and there is still a connection to SCS.
Change-Id: I66de244f184ab0618944c129db4062d09f72e6d1
TreeHugger Robot [Wed, 21 Jun 2017 21:47:29 +0000 (21:47 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
Tomasz Wasilczyk [Wed, 21 Jun 2017 21:36:34 +0000 (21:36 +0000)]
Merge "Implement client death monitoring."
TreeHugger Robot [Wed, 21 Jun 2017 21:25:47 +0000 (21:25 +0000)]
Merge "Added BaseAdapter.setAutofillOptions()"
Juan Lang [Wed, 21 Jun 2017 21:25:18 +0000 (21:25 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib."
Pavel Grafov [Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5
Tomasz Wasilczyk [Wed, 21 Jun 2017 21:23:51 +0000 (21:23 +0000)]
Merge "Notify AudioService on opened/closed radio tuner."
Pavel Grafov [Wed, 21 Jun 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
Shane Farmer [Mon, 19 Jun 2017 19:52:04 +0000 (12:52 -0700)]
AAPT2: Split APK by ABI.
Added a FilterChain that can apply multiple filter steps to an APK file
as it is being written to disk. The first filter applied is by ABI. If
a library in the APK does not match the filter it is skipped.
Added an AbiFilter that keeps files that are either not native libs or
are for the set of wanted ABIs
Test: ran unit tests locally
Test: ran against an APK with ARM and x68 libs and diffed the results
Change-Id: I3fb901d3de3513e85f2a2763a8e4487a28ed4881
Rob Carr [Wed, 21 Jun 2017 21:08:31 +0000 (21:08 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I9ed40cbf0724627bcc89a2dd305ba61f206570e0
Dianne Hackborn [Wed, 21 Jun 2017 21:07:00 +0000 (21:07 +0000)]
Merge "Work on issue #
62065889: Assess thresholds and criteria for killing..."
Amith Yamasani [Wed, 21 Jun 2017 21:06:44 +0000 (14:06 -0700)]
Clarify startScan API on how to get results
Make it clear in BluetoothLeScanner on how to get results
when starting a scan for a PendingIntent.
Bug:
38365430
Test: make offline-sdk-docs
Change-Id: I0bf88d751c89a8a478db985713357e153ac08595