OSDN Git Service
Adora Zhang [Tue, 26 Jun 2018 02:18:41 +0000 (19:18 -0700)]
Pull AUTOGROUP_AT_COUNT into an XML config.
Test: runtest systemui-notification
Change-Id: I0bf1bacb116b1cf4e77a2e1020c8de0749173224
Matthew Ng [Thu, 28 Jun 2018 17:45:40 +0000 (10:45 -0700)]
Merge "Do not create highlight if track width is invalid" into pi-dev am:
ed60140a93
am:
f3cdbd2755
Change-Id: Ia25977dd17a536b85d57e5700ffe02244dff77cb
Matthew Ng [Thu, 28 Jun 2018 17:37:50 +0000 (10:37 -0700)]
Merge "Do not create highlight if track width is invalid" into pi-dev
am:
ed60140a93
Change-Id: I1fc23d1edd74b8aa0368da397bbdb84bac361da3
TreeHugger Robot [Thu, 28 Jun 2018 17:34:31 +0000 (17:34 +0000)]
Merge "Remove unused SMS & WAP intent filters"
TreeHugger Robot [Thu, 28 Jun 2018 17:34:11 +0000 (17:34 +0000)]
Merge "Remove sleep_timeout setting from backup"
TreeHugger Robot [Thu, 28 Jun 2018 17:25:37 +0000 (17:25 +0000)]
Merge "Do not create highlight if track width is invalid" into pi-dev
Bernardo Rufino [Thu, 28 Jun 2018 09:59:24 +0000 (10:59 +0100)]
Remove sleep_timeout setting from backup
It is not user-configurable.
Bug:
79779285
Test: atest SettingsBackupTest
Test: # w/ LocalTransport
adb shell settings put secure sleep_timeout 5000
adb shell bmgr backupnow com.android.providers.settings
adb shell settings put secure sleep_timeout 3000
adb shell bmgr restore 1 com.android.providers.settings
adb shell settings get secure sleep_timeout => ensure 3000
Change-Id: I68bf2f91cc3d4c00463468a6abaef3b64d5c10b9
WyattRiley [Sat, 23 Jun 2018 17:37:48 +0000 (10:37 -0700)]
Remove unused SMS & WAP intent filters
These intent filters are no longer listened to since Oreo,
so removing their setup.
Bug:
110925879
Test: Build & GPS sanity check on Pixel 2
Change-Id: Ie6e9e0ecf5d42d250a37a1d89245cb088cca75fa
Yuanjia Hsu [Thu, 28 Jun 2018 13:10:27 +0000 (13:10 +0000)]
Merge "Add separated emergency option on power menu"
TreeHugger Robot [Thu, 28 Jun 2018 05:48:29 +0000 (05:48 +0000)]
Merge "Reduce screen layout in task override configuration from its parent config"
Shawn Willden [Thu, 28 Jun 2018 05:43:43 +0000 (22:43 -0700)]
Merge "Correct the keystore alias used for secure imports" into pi-dev am:
143c65d520
am:
bd3440cac9
Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3
Shawn Willden [Thu, 28 Jun 2018 05:16:49 +0000 (22:16 -0700)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
am:
143c65d520
Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
TreeHugger Robot [Thu, 28 Jun 2018 05:07:38 +0000 (05:07 +0000)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
Dan Sandler [Thu, 28 Jun 2018 04:42:12 +0000 (21:42 -0700)]
[automerger skipped] Merge "P is for PAINT." into pi-dev am:
bed68535c0
am:
69baf0d2a4 -s ours
Change-Id: I5bbc3a4461fbf6fcbe05b6465d1335f845f97c1b
Louis Chang [Tue, 26 Jun 2018 09:58:29 +0000 (17:58 +0800)]
Reduce screen layout in task override configuration from
its parent config
This prevented scheduling unexpected screen layout size
changes to client when entering PIP.
Bug:
110808291
Test: atest ActivityManagerPinnedStackTests
Test: go/wm-smoke
Change-Id: I6ff55bedad29df2ae3d00cdd18a748c052fae750
Dan Sandler [Thu, 28 Jun 2018 04:10:03 +0000 (21:10 -0700)]
Merge "P is for PAINT." into pi-dev
am:
bed68535c0
Change-Id: Ibf1f14dea6efd09f5d2777d663bdfa69254d572d
TreeHugger Robot [Thu, 28 Jun 2018 03:49:05 +0000 (03:49 +0000)]
Merge "P is for PAINT." into pi-dev
Atanas Kirilov [Thu, 28 Jun 2018 03:36:15 +0000 (20:36 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f am:
0f4152e815 am:
387e0bf842
am:
2f2e754b6a
Change-Id: I7bc2c16a41cab48e0d0d0ade0f636ac1e2eead7a
TreeHugger Robot [Thu, 28 Jun 2018 03:28:32 +0000 (03:28 +0000)]
Merge "Stop invoke initAppOps in Camera default constructor."
Atanas Kirilov [Thu, 28 Jun 2018 03:25:02 +0000 (20:25 -0700)]
[automerger skipped] Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8 am:
ab3235ad5b am:
5fb8ac2010
am:
97238d791f -s ours
Change-Id: Icf3a98f193be43b1b82e88c2ec88fe1aa3f33093
Atanas Kirilov [Thu, 28 Jun 2018 03:16:08 +0000 (20:16 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c am:
2b8be3932b am:
d63cfc9261
am:
3d058ea5a0
Change-Id: Ice3a7ee74d4a4bf18ba6fa8a00022ecdd9eaa386
Atanas Kirilov [Thu, 28 Jun 2018 03:02:39 +0000 (20:02 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee am:
1b67b798cf -s ours am:
1028b26d46 -s ours
am:
b88cac5977 -s ours
Change-Id: I0d8cecbe603a931fa874de932da94fc566bba728
TreeHugger Robot [Thu, 28 Jun 2018 02:44:32 +0000 (02:44 +0000)]
Merge "P is for PAINT."
Atanas Kirilov [Thu, 28 Jun 2018 02:15:59 +0000 (19:15 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f am:
0f4152e815
am:
387e0bf842
Change-Id: I6ed4b999bfc3b434971609088457aa56d042db99
Atanas Kirilov [Thu, 28 Jun 2018 01:55:18 +0000 (18:55 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8 am:
ab3235ad5b
am:
5fb8ac2010
Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db
Atanas Kirilov [Thu, 28 Jun 2018 01:48:55 +0000 (18:48 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f
am:
0f4152e815
Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e
Atanas Kirilov [Thu, 28 Jun 2018 01:45:18 +0000 (18:45 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c am:
2b8be3932b
am:
d63cfc9261
Change-Id: Id96bf7c84b589849d1436cb2c926df9e8d0d09dd
Atanas Kirilov [Thu, 28 Jun 2018 01:35:46 +0000 (18:35 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8
am:
ab3235ad5b
Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3
Atanas Kirilov [Thu, 28 Jun 2018 01:29:36 +0000 (18:29 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c
am:
2b8be3932b
Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3
Atanas Kirilov [Thu, 28 Jun 2018 01:27:10 +0000 (18:27 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2
am:
245cc0559f
Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0
Atanas Kirilov [Thu, 28 Jun 2018 01:10:46 +0000 (18:10 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee am:
1b67b798cf -s ours
am:
1028b26d46 -s ours
Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898
Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
am:
8b047ec8a2
Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2
Atanas Kirilov [Thu, 28 Jun 2018 00:37:57 +0000 (17:37 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e
am:
dcc95b94f8
Change-Id: I23209ea505140a48177b1b4fe78d36699240653e
Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am:
c6dbcc137e
Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a
Atanas Kirilov [Thu, 28 Jun 2018 00:21:25 +0000 (17:21 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c
am:
00bf4c5b5c
Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7
TreeHugger Robot [Thu, 28 Jun 2018 00:09:54 +0000 (00:09 +0000)]
Merge "Reduce overview proxy connection backoff time to hide back faster"
Atanas Kirilov [Thu, 28 Jun 2018 00:09:53 +0000 (17:09 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee
am:
1b67b798cf -s ours
Change-Id: I1f209b583519e73c0912db7583b34324003a5526
Kevin Chyn [Thu, 28 Jun 2018 00:02:19 +0000 (00:02 +0000)]
Merge "Add kchyn to SystemUI owners"
TreeHugger Robot [Thu, 28 Jun 2018 00:01:59 +0000 (00:01 +0000)]
Merge "Update notification settings Javadoc links."
Chavi Weingarten [Thu, 28 Jun 2018 00:00:24 +0000 (00:00 +0000)]
Merge "Don't keep current IME target if it's being removed."
Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
am:
000036eb4c
Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0
Atanas Kirilov [Wed, 27 Jun 2018 23:56:36 +0000 (16:56 -0700)]
Merge "Backporting of b/
77821568" into oc-dev am:
9774459633
am:
f3f6e2f9ee
Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0
Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Backporting of b/
77821568" into oc-dev
am:
9774459633
Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f skipped:
c3e741e530
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd skipped:
430c4395a3
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/
77821568" into oc-dev
Kevin Chyn [Wed, 27 Jun 2018 23:19:33 +0000 (16:19 -0700)]
Add kchyn to SystemUI owners
Test: builds
Change-Id: I2774c26b01085180d5a9cbe3e578f73d48c869e9
Kurt Marcinkiewicz [Wed, 27 Jun 2018 23:10:55 +0000 (23:10 +0000)]
Merge "Fix NPE when country is absent from user's locale"
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.
Bug:
109925861
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Merged-In: Ic3020007c716be264e9523d6dbae9e13a95fa571
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.
Bug:
109925861
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
Tyler Gunn [Wed, 27 Jun 2018 22:48:44 +0000 (15:48 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
af228ca978 am:
206bacb18b
am:
05902faa8b
Change-Id: I1b1c55250e2f3e636e2dea6e35cca7c08051b4b7
Tyler Gunn [Wed, 27 Jun 2018 22:38:13 +0000 (15:38 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
af228ca978
am:
206bacb18b
Change-Id: I66364e0e5213410595ec110c422125b2c93f0411
Matthew Ng [Wed, 27 Jun 2018 22:32:09 +0000 (15:32 -0700)]
Reduce overview proxy connection backoff time to hide back faster
Switching to guest user would show a dialog to continue or start the
guest profile again and this would show the back button. At the same
time the connection is being established with the launcher again. First
time would sometimes fail causing a timeout of 5 secs before trying to
reconnect again. During the 5 sec timeout the back button would continue
to be visible until it reconnects and hides it. If this is reduced to 1
sec then reconnection would occur quicker and as a result hide the back
button.
Fixes:
109662462
Test: switch to guest user, immediately press continue and wait for back
button disappear
Change-Id: Id81b7f175834fb1eae8a0787674bbc130c91a5a2
Jeff Sharkey [Wed, 27 Jun 2018 22:33:07 +0000 (22:33 +0000)]
Merge "Give StrictMode more bits to work with."
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
TreeHugger Robot [Wed, 27 Jun 2018 22:26:26 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Kevin Chyn [Wed, 27 Jun 2018 22:09:01 +0000 (22:09 +0000)]
Merge "6/n: Have FaceService extend BiometricService"
TreeHugger Robot [Wed, 27 Jun 2018 21:57:14 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 21:56:21 +0000 (21:56 +0000)]
Merge "Remove unused resources."
Andrew Zeng [Fri, 22 Jun 2018 22:25:58 +0000 (15:25 -0700)]
Update notification settings Javadoc links.
Change-Id: If9ed94473fb5c0607fa44b9a42c62837878ffd00
Nathan Harold [Wed, 27 Jun 2018 20:21:36 +0000 (13:21 -0700)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master am:
998c416213
am:
d9a7a59007
Change-Id: I2e577b36fbc50f7df92d1e0aad9e837219944597
Nathan Harold [Wed, 27 Jun 2018 20:12:23 +0000 (13:12 -0700)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
am:
998c416213
Change-Id: I352b53ac10fed126a9e585bc1d3de1430a8cff4f
Brad Ebinger [Wed, 27 Jun 2018 20:10:48 +0000 (13:10 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl." am:
f03b8e2471 am:
0397b9b65d
am:
42bf3bef2b
Change-Id: I0de662b8429769129017ea5549d590a335842540
Nathan Harold [Wed, 27 Jun 2018 20:02:59 +0000 (20:02 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
Tyler Gunn [Wed, 27 Jun 2018 20:02:37 +0000 (20:02 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Brad Ebinger [Wed, 27 Jun 2018 19:55:04 +0000 (12:55 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl." am:
f03b8e2471
am:
0397b9b65d
Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b
Brad Ebinger [Wed, 27 Jun 2018 19:46:39 +0000 (12:46 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
am:
f03b8e2471
Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
Emilian Peev [Wed, 27 Jun 2018 19:43:28 +0000 (12:43 -0700)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev am:
9504cd35ec
am:
9f6920c40d
Change-Id: I9ce2084f66bdc10176baeb1213d0b0215cc2bf6b
Emilian Peev [Wed, 27 Jun 2018 19:34:49 +0000 (12:34 -0700)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev
am:
9504cd35ec
Change-Id: Ie16f3b2f24bf556ae37c4e32e869d9454578fd07
TreeHugger Robot [Wed, 27 Jun 2018 19:26:42 +0000 (19:26 +0000)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev
Rubin Xu [Wed, 27 Jun 2018 19:01:21 +0000 (12:01 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds." am:
9916d4b3e8 -s ours am:
f751657ad8 -s ours
am:
a3ea288b3c -s ours
Change-Id: If19c98d0becb9b1e788f6a7196f14211a52d2610
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Tobias Thierer [Wed, 27 Jun 2018 18:44:11 +0000 (11:44 -0700)]
Merge "Track dropping of throws clause in Pattern.java." am:
251a0cfb78 am:
16de9c5a8a
am:
af95708645
Change-Id: I21d9c90f43d9b985443f270043b8c1df77377377
Rubin Xu [Wed, 27 Jun 2018 18:40:01 +0000 (11:40 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds." am:
9916d4b3e8 -s ours
am:
f751657ad8 -s ours
Change-Id: If474cfa932f6bff8065633a263987f3e28d64890
Tobias Thierer [Wed, 27 Jun 2018 18:31:39 +0000 (11:31 -0700)]
Merge "Track dropping of throws clause in Pattern.java." am:
251a0cfb78
am:
16de9c5a8a
Change-Id: I90eb372fc1d4bf0942cb8d072504312f50d26797
Kevin Chyn [Wed, 20 Jun 2018 01:41:12 +0000 (18:41 -0700)]
6/n: Have FaceService extend BiometricService
In the Service layer, this change is pretty much the same as ag/
4340638.
FingerprintService already extends BiometricService which contains all
of the common code. FaceService now does the same after this change.
Updated the Manager layer to use the infrastructure added in P, namely
- Private APIs for BiometricPrompt
- Removed FaceManager#CryptoObject, use biometrics/CryptoObject directly
- Few other BiometricAuthenticator things
Bug:
110387294
Test: enrolling FP still works
Test: removing FP still works
Test: changing FP name persists across reboots
Test: enumerating still works (extra framework fp, extra hw fp)
Test: keyguard still receives lockout reset callbacks
Change-Id: I2195b08e28d024a120df56fe87b0dd4f9b96505a
Rubin Xu [Wed, 27 Jun 2018 18:27:29 +0000 (11:27 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds."
am:
9916d4b3e8 -s ours
Change-Id: Ieac6b403e5c242f161da56a917e55b07badc888d
Brad Ebinger [Wed, 27 Jun 2018 18:24:51 +0000 (18:24 +0000)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
Tobias Thierer [Wed, 27 Jun 2018 18:21:42 +0000 (11:21 -0700)]
Merge "Track dropping of throws clause in Pattern.java."
am:
251a0cfb78
Change-Id: Icb30c1ffaba63d9f633bf45c9af2a949ddbf1fcd
Aaron Heuckroth [Wed, 27 Jun 2018 18:14:59 +0000 (18:14 +0000)]
Merge "Adjust 'No notifications' text styling to match buttons."
TreeHugger Robot [Wed, 27 Jun 2018 17:43:17 +0000 (17:43 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:42:10 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:36:24 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:26:27 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Dan Sandler [Wed, 27 Jun 2018 17:18:11 +0000 (10:18 -0700)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES. am:
a5c846c3fa
am:
90d531a96c
Change-Id: I2c4de0b96eccf189bdcc9447e076f29669fa6e8d
Dan Sandler [Wed, 27 Jun 2018 17:06:40 +0000 (10:06 -0700)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.
am:
a5c846c3fa
Change-Id: Ib8020b3d649391b591a191f7ee692071bfa538d1
Rubin Xu [Wed, 27 Jun 2018 16:27:26 +0000 (16:27 +0000)]
Merge "Support seamless handover between VPN fds."
Treehugger Robot [Wed, 27 Jun 2018 16:01:14 +0000 (16:01 +0000)]
Merge "Track dropping of throws clause in Pattern.java."
Tobias Thierer [Wed, 27 Jun 2018 15:40:26 +0000 (08:40 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28." am:
b5f35aeaf3 am:
5442964205
am:
e4449497ed
Change-Id: I3bbb854c61f476caaef20eeae2bbcc9473c49469
Tobias Thierer [Wed, 27 Jun 2018 15:26:11 +0000 (08:26 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28." am:
b5f35aeaf3
am:
5442964205
Change-Id: I4dfc6aa0a062998b186b7abfef2cae41463239b2
Tobias Thierer [Wed, 27 Jun 2018 15:14:58 +0000 (08:14 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
am:
b5f35aeaf3
Change-Id: I55ba23bfae8f578eb75a4cbfeb2ed4ad1492867d
Tobias Thierer [Wed, 27 Jun 2018 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
TreeHugger Robot [Wed, 27 Jun 2018 12:34:18 +0000 (12:34 +0000)]
Merge "Get new surface if it was released from setWindowStopped"
Neil Fuller [Wed, 27 Jun 2018 12:15:53 +0000 (05:15 -0700)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master am:
ca48eb7fa9
am:
6aba7c3646
Change-Id: I38f6a5a3dcc1d68580b3a3ac75355797fa75ccd6
Neil Fuller [Wed, 27 Jun 2018 12:10:18 +0000 (05:10 -0700)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
am:
ca48eb7fa9
Change-Id: I350bcde63f1874d4a237e81d7f93bed00cbba6a3
Bill Yi [Wed, 27 Jun 2018 11:44:32 +0000 (04:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic581a3f43aa2e06bf82e07276f4f38190977387c
Auto-generated-cl: translation import
Peter Visontay [Thu, 14 Jun 2018 13:47:12 +0000 (14:47 +0100)]
Fix broken links in the Javadoc of Activity.requestPermissions().
Test: none
Change-Id: I43b36394d4b50882edbcc057610b609cabf34f9a
Neil Fuller [Wed, 27 Jun 2018 10:40:06 +0000 (11:40 +0100)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib06f2869e5aa1788c8d5fc281a8565420e93d8f7
Bill Yi [Wed, 27 Jun 2018 09:59:22 +0000 (02:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iceb272ffa664416b4eafe5eb32098d02e93a095d
Auto-generated-cl: translation import