OSDN Git Service
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:25:37 +0000 (17:25 +0000)]
Merge "Do not create highlight if track width is invalid" into pi-dev
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: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 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
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
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
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
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
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
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
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: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
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
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
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
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: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."
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
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
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"
Dan Sandler [Thu, 21 Jun 2018 17:57:28 +0000 (13:57 -0400)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.
This change also activates night mode when the device enters
battery saver (saving substantial power on OLED screens).
Bug:
80307398
Test: adb shell service call uimode 4 i32 1 # nightfall
adb shell service call uimode 4 i32 2 # morningtide
Change-Id: I9c08a749d4cd99ab7231363b045949eb2e830dfa
Julia Reynolds [Wed, 27 Jun 2018 01:26:14 +0000 (18:26 -0700)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
am:
694b4ae846
Change-Id: I54b861a2a4d72cfdc1734fc5528b10bce5f1d0ef
TreeHugger Robot [Wed, 27 Jun 2018 01:09:48 +0000 (01:09 +0000)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
David Sehr [Wed, 27 Jun 2018 00:25:44 +0000 (17:25 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote" am:
f40f05229c -s ours
am:
984fc6eae1 -s ours
Change-Id: I0ac0bcd1c3f9242d4a2efab56627a61baf79676c
Josh Gao [Wed, 27 Jun 2018 00:16:03 +0000 (17:16 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory." am:
c00dd28164
am:
258513f581
Change-Id: I7e9f930c94d4fbb4ac23473c017bc8762e8d55dc
David Sehr [Wed, 27 Jun 2018 00:13:55 +0000 (17:13 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote"
am:
f40f05229c -s ours
Change-Id: I3d5162e3967503d85aae73fe6bd37e0f50516b9d
Josh Gao [Wed, 27 Jun 2018 00:09:06 +0000 (17:09 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
am:
c00dd28164
Change-Id: I788e8747361a5c0e3324aa7ac88951428b5f0829
Evan Laird [Tue, 26 Jun 2018 23:42:56 +0000 (16:42 -0700)]
Merge "Make BT icon more prominent" into pi-dev
am:
6c90bf605e
Change-Id: Ic9c9a19e49c32187c3d65f361fc7cae16a7d0a56
TreeHugger Robot [Tue, 26 Jun 2018 23:24:30 +0000 (23:24 +0000)]
Merge "Make BT icon more prominent" into pi-dev
Matthew Ng [Tue, 26 Jun 2018 22:22:56 +0000 (15:22 -0700)]
Do not create highlight if track width is invalid
Test: change display font size
Change-Id: I29b97dee07d39b1b1efd4871b625a859d7fa2e09
Fixes:
110814530
Ajay Nambi [Wed, 28 Feb 2018 02:40:14 +0000 (18:40 -0800)]
Telephony: Introduce a base class for ISMS.aidl.
Add a dummy base class implementation for
AIDL APIs defined. Clients can override the
required APIs.
Bug:
73994017
Change-Id: Ifd14e04ae0467a7b963cd993cfd514660f14fa95
Tyler Gunn [Tue, 26 Jun 2018 22:44:03 +0000 (15:44 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear." am:
690f008e3f -s ours
am:
6f8fef77de -s ours
Change-Id: Ibd0b306b9776821b84680894c14250e3d9a2913a
Tyler Gunn [Tue, 26 Jun 2018 22:26:09 +0000 (15:26 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear."
am:
690f008e3f -s ours
Change-Id: Ibb2c56554f0df15cf287c90aa1f183674e948f3d
Hall Liu [Tue, 26 Jun 2018 22:17:12 +0000 (15:17 -0700)]
Merge "Make RttTextStream's read interruptible" into pi-dev
am:
21ef4b3acb
Change-Id: Ifc793a3b59e7e9cc5c09cffa8d147feeb5a6e900
Lucas Dupin [Tue, 26 Jun 2018 22:04:34 +0000 (15:04 -0700)]
Merge "Do not animate scrims when launching camera" into pi-dev
am:
aa21ec053c
Change-Id: Ic3089144cb26864bd0e49846348441c7857cce49
David Sehr [Tue, 26 Jun 2018 22:02:16 +0000 (22:02 +0000)]
Merge "Split fork and specialize in zygote"
Hall Liu [Tue, 26 Jun 2018 22:00:17 +0000 (22:00 +0000)]
Merge "Make RttTextStream's read interruptible" into pi-dev
Lucas Dupin [Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)]
Merge "Do not animate scrims when launching camera" into pi-dev
Treehugger Robot [Tue, 26 Jun 2018 21:38:14 +0000 (21:38 +0000)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
Tyler Gunn [Tue, 26 Jun 2018 21:14:27 +0000 (21:14 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear."
Steven Moreland [Tue, 26 Jun 2018 21:10:33 +0000 (14:10 -0700)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
am:
3c6186c474
Change-Id: Id03d6d4af7ea4713bf971d54798a55be086a0ca3
TreeHugger Robot [Tue, 26 Jun 2018 20:49:15 +0000 (20:49 +0000)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
Andrew Sapperstein [Tue, 26 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Merge "Hide system apps until installed (1/2)" into pi-dev
am:
70a9f39e6a
Change-Id: Ide5ea4b18ca95ee061bf84cb349369b2468504d1
Julia Reynolds [Mon, 18 Jun 2018 13:29:19 +0000 (09:29 -0400)]
DO NOT MERGE Log notification interruptions to TRON
Test: manual
Bug:
110209821
Change-Id: Ic3521f36127aa0e928d0be5ce9819c78c2bc9bc5
Andrew Sapperstein [Tue, 26 Jun 2018 20:03:38 +0000 (20:03 +0000)]
Merge "Hide system apps until installed (1/2)" into pi-dev
Lucas Dupin [Tue, 12 Jun 2018 02:16:03 +0000 (19:16 -0700)]
Do not animate scrims when launching camera
There's already a black overlay with a camera icon, it's not necessary
to animate the scrims.
Change-Id: I52472372420eb8ba052a17cdde147d24dafadce0
Fixes:
109767309
Test: double tap power button from lock screen and aod
David Sehr [Wed, 23 May 2018 22:23:01 +0000 (15:23 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Merged-In: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Josh Gao [Tue, 26 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Fix memory leak in RenderThread::dumpGraphicsMemory.
This would have been a double-close of fd, except we just leak the
FILE* instead.
Test: treehugger
Change-Id: I519366fbcf0eb6f03f79c22abfa2b1b1b493a70a
Android Build Merger (Role) [Tue, 26 Jun 2018 16:52:04 +0000 (16:52 +0000)]
Merge "Merge "Docs: fixed variables" into pi-dev am:
116158689c" into pi-dev-plus-aosp
Laura Davis [Tue, 26 Jun 2018 16:51:30 +0000 (09:51 -0700)]
Merge "Docs: fixed variables" into pi-dev
am:
116158689c
Change-Id: Ia4219c6d6502b9348ed30453b46801d107dd2a2c
David Sehr [Tue, 26 Jun 2018 16:48:08 +0000 (09:48 -0700)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
am:
3937fbb439
Change-Id: I129586249b68364b7813a146fc5b48936b948174
Laura Davis [Tue, 26 Jun 2018 16:42:43 +0000 (16:42 +0000)]
Merge "Docs: fixed variables" into pi-dev
David Sehr [Tue, 26 Jun 2018 16:34:43 +0000 (16:34 +0000)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
Steven Moreland [Mon, 25 Jun 2018 19:42:51 +0000 (12:42 -0700)]
services.core.unboosted: hidl manager->static_libs
Bug:
77307025
Test: boot device w/o hidl libs on boot classpath, no loading
error
Change-Id: Iae2b0015a29de71c22e6bc31004613bbf4ca971b
Tobias Thierer [Thu, 21 Jun 2018 15:59:18 +0000 (16:59 +0100)]
Track dropping of throws clause in Pattern.java.
This is not really an API change because PatternSyntaxException
is unchecked (extends RuntimeException). The behavior has not
changed (PatternSyntaxException can still be thrown).
Bug:
109659282
Test: Treehugger
Change-Id: I5759eee10b27307b68f15fdd6f6f1a258ee01529
Tobias Thierer [Thu, 21 Jun 2018 09:31:39 +0000 (10:31 +0100)]
TextUtils: track behavior change of Pattern.split() when targeting > 28.
Another CL in this topic changes the behavior of String.split() and
Pattern.split() to omit a "" generated by a leading zero-width match.
TextUtils.split() is implemented on top of these methods and therefore
adopts the behavior change by default.
The behavior change only affects apps targeting API versions > 28.
Test: cts-tradefed run singleCommand cts-dev -m CtsTextTestCases \
-t android.text.cts.TextUtilsTest
Test: cts-tradefed run singleCommand cts-dev -m CtsLibcoreTestCases
Bug:
109659282
Change-Id: I8abe251353f8eacf1429ac9a8e272d50a0944c29
Shawn Willden [Sat, 23 Jun 2018 21:38:02 +0000 (15:38 -0600)]
Correct the keystore alias used for secure imports
An Android-O timeframe refactor removed all use of keystore "skey"
aliases. Creating one not only partially reverses that refactor, but
it also results in a key alias which cannot be deleted in some cases,
causing AndroidKeyStoreTest failures during the second run of CTS.
Bug:
80228327
Test: CTS tests ImportWrappedKeyTest and AndroidKeyStoreTest, in that order
Change-Id: I348ba421f29cdf6c65fc98be3a25d19938d559c1
Neil Fuller [Tue, 26 Jun 2018 12:23:26 +0000 (05:23 -0700)]
Merge "Add more behavior to TimeDetectorService" am:
b1fc5a4c7e
am:
325ecf7df4
Change-Id: I28d5b3dbd666dc9d097f6fb7c15dc5ba8cf931e9
Neil Fuller [Tue, 26 Jun 2018 12:14:31 +0000 (05:14 -0700)]
Merge "Add more behavior to TimeDetectorService"
am:
b1fc5a4c7e
Change-Id: Ibbda2d253bf807cc480a4218aa1d898d6737ec7b
Jorim Jaggi [Tue, 26 Jun 2018 11:44:36 +0000 (04:44 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
am:
fd77e69f28
Change-Id: Ife380bd268aa2c760dff2dec4f7a8358721cbe95
Jorim Jaggi [Tue, 26 Jun 2018 11:34:03 +0000 (11:34 +0000)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
Neil Fuller [Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
am:
e01a7adf5a
Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe
Neil Fuller [Tue, 26 Jun 2018 10:55:46 +0000 (11:55 +0100)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
Emilian Peev [Tue, 26 Jun 2018 09:13:39 +0000 (10:13 +0100)]
ImageReader: Set inverse diplay transform if needed
Image transform sometimes could be missing the inverse
display flag. Any buffers that pass through BQs will
have this bit reset and moved in a separate buffer item
field. To restore and pass the original transform forward
check whether the flag got reset and re-enable it
accordingly.
Bug:
110641448
Test: Manual using application,
Camera CTS
Change-Id: Ia849f62333be40038a02768563b2f93e2ccf61ce
Neil Fuller [Thu, 21 Jun 2018 14:16:36 +0000 (15:16 +0100)]
Prepare for migration to the time detector service
Paves the way for moving more behavior to the time detector
service from the NetworkTimeUpdateService.
The NewNetworkTimeUpdateService is effectively identical to
the OldNetworkTimeUpdateService in this initial commit.
Bug:
78217059
Test: build / boot
Merged-In: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Change-Id: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Neil Fuller [Tue, 26 Jun 2018 08:43:55 +0000 (08:43 +0000)]
Merge "Add more behavior to TimeDetectorService"
Erik Kline [Tue, 26 Jun 2018 08:40:33 +0000 (01:40 -0700)]
Merge "Make auto-upstream the default tethering behaviour" am:
e193298c4a
am:
1239734050
Change-Id: I85f4cc390ea69d3499e1f2341770d586a1cb2b51
Neil Fuller [Tue, 26 Jun 2018 08:34:56 +0000 (08:34 +0000)]
Merge "Minimum viable TimeZoneDetectorService"
Erik Kline [Tue, 26 Jun 2018 08:32:31 +0000 (01:32 -0700)]
Merge "Make auto-upstream the default tethering behaviour"
am:
e193298c4a
Change-Id: Ie160bb6422f7a8f218dbf1374fdfadb0b957150d
OSDN Git Service
