OSDN Git Service
Jaewan Kim [Mon, 26 Mar 2018 05:28:46 +0000 (05:28 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
am:
c92f8b4053
Change-Id: If507935451775e59e30465a48df8f6c5dc0a8050
Jaewan Kim [Mon, 26 Mar 2018 05:16:59 +0000 (05:16 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
am:
a6ba53d69d
Change-Id: Id3e25aa4e9f71d646f263de372901fbd35e81569
Jaewan Kim [Mon, 26 Mar 2018 05:12:17 +0000 (05:12 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 04:57:48 +0000 (04:57 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
Dmitry Dementyev [Mon, 26 Mar 2018 02:43:28 +0000 (02:43 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
am:
a5b29ffffe
Change-Id: Ida09ae3747db332fcaa4ccb8a2bb774c96ce0caf
Jaewan Kim [Mon, 26 Mar 2018 02:26:14 +0000 (02:26 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
am:
c4f56a6be5
Change-Id: Ifd0c8a4c07ee3ccb7b377cff486e67801750a7ee
Dmitry Dementyev [Mon, 26 Mar 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 02:07:57 +0000 (02:07 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:51:04 +0000 (01:51 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
am:
46c07f3bd3
Change-Id: I0ca72ddccf04ddc7ba5f1183a503d582dee733ad
Jaewan Kim [Mon, 26 Mar 2018 01:40:00 +0000 (01:40 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
am:
a7fac1c115
Change-Id: I2243ddbc461aa577374954e09b09489ec1b9fcd5
Jaewan Kim [Mon, 26 Mar 2018 01:31:54 +0000 (01:31 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:24:21 +0000 (01:24 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 22:16:34 +0000 (22:16 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
am:
4b46d3e1e4
Change-Id: Ie509b2878708ec1e7466679f503ec73cc9288206
Jeff Sharkey [Sun, 25 Mar 2018 22:05:45 +0000 (22:05 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
Svetoslav Ganov [Sun, 25 Mar 2018 16:47:55 +0000 (16:47 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
am:
069aa9dce4
Change-Id: I661b94bbf31828963cd1b752fcdc457f72fa88b8
Svetoslav Ganov [Sun, 25 Mar 2018 16:32:54 +0000 (16:32 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 09:08:20 +0000 (03:08 -0600)]
Add UX string tweaks before string freeze.
Test: builds, boots
Bug:
76097999
Change-Id: I85e82a039d0b3b857257a3143a7b94de67ccada2
Suprabh Shukla [Sat, 24 Mar 2018 22:49:37 +0000 (22:49 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
am:
6da53af9c5
Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
TreeHugger Robot [Sat, 24 Mar 2018 22:36:21 +0000 (22:36 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
Seigo Nonaka [Sat, 24 Mar 2018 21:20:11 +0000 (21:20 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
am:
5dbb3fe124
Change-Id: Idd0927134ecf65e42ee53d0898a149ce66bc30e2
TreeHugger Robot [Sat, 24 Mar 2018 21:03:31 +0000 (21:03 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
Chenjie Yu [Sat, 24 Mar 2018 16:41:14 +0000 (16:41 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
am:
c8ab224b2a
Change-Id: I600831c2369d5985c22d336e8915ae261b6dfb06
TreeHugger Robot [Sat, 24 Mar 2018 16:28:01 +0000 (16:28 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
Erik Kline [Sat, 24 Mar 2018 16:12:38 +0000 (16:12 +0000)]
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
am:
ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
TreeHugger Robot [Sat, 24 Mar 2018 15:58:42 +0000 (15:58 +0000)]
Merge "Pass all relevant resolver info to netd" into pi-dev
Martijn Coenen [Sat, 24 Mar 2018 06:17:31 +0000 (06:17 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
am:
96b341e43a
Change-Id: I925f2dd25d8fab1ddbef77e69778b7b07c4c1120
Svet Ganov [Sat, 24 Mar 2018 06:07:10 +0000 (06:07 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
am:
457bcefb65
Change-Id: I40155c6ad7ebb8c6c2fec78800c382523ade19db
Martijn Coenen [Sat, 24 Mar 2018 05:58:25 +0000 (05:58 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:51:16 +0000 (05:51 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
Salvador Martinez [Sat, 24 Mar 2018 05:31:49 +0000 (05:31 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
am:
f43923f009
Change-Id: I367aa574c48ec365c03ddcfbe8c116ce500e1980
TreeHugger Robot [Sat, 24 Mar 2018 05:22:28 +0000 (05:22 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
Nathan Harold [Sat, 24 Mar 2018 05:13:23 +0000 (05:13 +0000)]
Merge changes from topic "data-service-grant-policy" into pi-dev
am:
775e291c2e
Change-Id: I9e247071614faa673057335844a6d51bcbc43b8d
Nathan Harold [Sat, 24 Mar 2018 05:00:42 +0000 (05:00 +0000)]
Merge changes from topic "data-service-grant-policy" into pi-dev
* changes:
Add Permissions Grant for TelephonyDataService
Add a Method to Revoke DefaultGrant Permissions
Erik Kline [Sun, 4 Mar 2018 12:01:01 +0000 (21:01 +0900)]
Pass all relevant resolver info to netd
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug:
34953048
Bug:
64133961
Bug:
72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit
e5dac904d361a349f1cfc48500a678d22e3a7316)
Alan Viverette [Sat, 24 Mar 2018 04:57:26 +0000 (04:57 +0000)]
Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev
am:
9ecfce3b44
Change-Id: I08aec9e06936ae7704c449c0e6220ddc83222aec
TreeHugger Robot [Sat, 24 Mar 2018 04:39:20 +0000 (04:39 +0000)]
Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:21:28 +0000 (04:21 +0000)]
Merge "Add new strings for Hearing Aid profile" into pi-dev
am:
45344b581c
Change-Id: Icb2a21269f2c0b1e10aa469ba33b816d8ff72121
Dmitry Dementyev [Sat, 24 Mar 2018 04:15:44 +0000 (04:15 +0000)]
Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev
am:
799c3a62f7
Change-Id: I532fae36d2cbb096ad0976cd6c619a5fddcee131
Stanley Tng [Sat, 24 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "Add new strings for Hearing Aid profile" into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 04:01:54 +0000 (04:01 +0000)]
Merge "Add more NonNull annotations to RecoveryController API" into pi-dev
am:
ea97f89048
Change-Id: I53fb3b3d1aca8c3beb63f135c26c0e669e2b91cf
Dmitry Dementyev [Sat, 24 Mar 2018 03:59:27 +0000 (03:59 +0000)]
Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 03:48:12 +0000 (03:48 +0000)]
Merge "Add more NonNull annotations to RecoveryController API" into pi-dev
Erik Kline [Sat, 24 Mar 2018 03:39:37 +0000 (03:39 +0000)]
Merge "Add a string message for Private DNS strict mode failure" into pi-dev
am:
a68dfc3cee
Change-Id: Ibbcd32e2035d4248053e0fd1d724985e889187f5
Kevin Chyn [Sat, 24 Mar 2018 03:32:49 +0000 (03:32 +0000)]
Merge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev
am:
266d179a04
Change-Id: I6a16480f615cdc72a84ae13a7c0a07b592c4ac93
Erik Kline [Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)]
Merge "Add a string message for Private DNS strict mode failure" into pi-dev
Kevin Chyn [Sat, 24 Mar 2018 03:21:24 +0000 (03:21 +0000)]
Merge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev
Jean-Michel Trivi [Sat, 24 Mar 2018 03:15:18 +0000 (03:15 +0000)]
Merge "PlayerBase: log when startWatching fails" into pi-dev
am:
3d9601d60e
Change-Id: Ifbaa316e788886e8b6503ae39f5ffcea9dc04ab6
Rohan Shah [Sat, 24 Mar 2018 03:07:36 +0000 (03:07 +0000)]
Merge "[QS] Update string name in prep for freeze" into pi-dev
am:
a5a9827328
Change-Id: I3a98ebf2aba2c74fbc39e5dbfeb4984da1351c80
Svet Ganov [Sat, 24 Mar 2018 00:44:30 +0000 (17:44 -0700)]
Notify all affected UIDs for user/audio restriction changes
Test: pass: adb shell am instrument -w com.android.frameworks.servicestests
/android.support.test.runner.AndroidJUnitRunner
pass: cts-tradefed run cts-dev -m CtsPermissionTestCases
-t android.permission.cts.AppOpsTest
Bug:
75274546
Change-Id: I788823fcc3ade8a4cf752d64bd11b87b212e4d31
John Reck [Sat, 24 Mar 2018 02:51:35 +0000 (02:51 +0000)]
Merge "Add missing computeOpacity call" into pi-dev
am:
3f5ab8bdf4
Change-Id: I7ba26906d57655421707d3d8734782c527de5e2e
Bill Yi [Sat, 24 Mar 2018 02:42:15 +0000 (02:42 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9491757682 -s ours
Change-Id: I3c80e3940ee74f0ceaa57a002c47db10c2b5da6f
Pavel Maltsev [Sat, 24 Mar 2018 02:41:40 +0000 (02:41 +0000)]
Merge "JobStore: persist unwanted set of capabilities" into pi-dev
am:
244df1e217
Change-Id: I726e25e9169a39cc6dc636ce866947e76ba388d1
Mohamed Abdalkader [Sat, 24 Mar 2018 02:37:50 +0000 (02:37 +0000)]
Merge "Unhide ImsReasonInfo Constructor" into pi-dev
am:
4f2e53fe48
Change-Id: I37d8fcfc10582f2c865b9c1a5df39e3ad788559c
Wale Ogunwale [Sat, 24 Mar 2018 02:18:52 +0000 (02:18 +0000)]
Merge "Make Assistant stack invisible behind split-screen stacks." into pi-dev
am:
b9e9f09486
Change-Id: I4aebdb83c4d74c52fbed4aa0d5ee94980ef514d2
TreeHugger Robot [Sat, 24 Mar 2018 02:14:38 +0000 (02:14 +0000)]
Merge "PlayerBase: log when startWatching fails" into pi-dev
Bill Yi [Sat, 24 Mar 2018 02:05:07 +0000 (02:05 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
02bfc97068 -s ours
Change-Id: I836fbf154864c5abc2fb890b0cdd70467636365d
TreeHugger Robot [Sat, 24 Mar 2018 02:01:17 +0000 (02:01 +0000)]
Merge "[QS] Update string name in prep for freeze" into pi-dev
Bill Yi [Sat, 24 Mar 2018 01:58:42 +0000 (01:58 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ceffe2fed9 -s ours
Change-Id: I5e6e9765bff6f15d04844f522fb4f54af9665e0f
Dmitry Dementyev [Sat, 24 Mar 2018 01:53:05 +0000 (01:53 +0000)]
Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
am:
9cd3e43d86
Change-Id: Iec63cea0f5657aa763a45e7bbd8a21479459c892
Andrii Kulian [Sat, 24 Mar 2018 01:44:46 +0000 (01:44 +0000)]
Merge "Revert "Use transaction for local activity relaunch"" into pi-dev
am:
603b911e48
Change-Id: I9443d43e9758916eb2ec6721c1ca9992bd7b9d87
Kevin Chyn [Sat, 24 Mar 2018 01:12:19 +0000 (18:12 -0700)]
Add accessibility string for FingerprintDialog(impl) authenticated
Bug:
74456537
Test: builds
Change-Id: I1edb54334bf5e148bac6c9e1583c6fd36bd9095a
Android Build Merger (Role) [Sat, 24 Mar 2018 01:22:24 +0000 (01:22 +0000)]
Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am:
444885b10d" into pi-dev-plus-aosp
TreeHugger Robot [Sat, 24 Mar 2018 01:22:15 +0000 (01:22 +0000)]
Merge "Add missing computeOpacity call" into pi-dev
Wale Ogunwale [Sat, 24 Mar 2018 01:21:39 +0000 (01:21 +0000)]
Merge "Don't show unsupported sdk warning in test harness." into pi-dev
am:
444885b10d
Change-Id: I750ffef919badf38d759a32b1067702692d2a9c2
TreeHugger Robot [Sat, 24 Mar 2018 01:21:28 +0000 (01:21 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 01:19:20 +0000 (01:19 +0000)]
Merge "JobStore: persist unwanted set of capabilities" into pi-dev
Seigo Nonaka [Sat, 24 Mar 2018 00:22:54 +0000 (17:22 -0700)]
Fix BoringLayout with PrecomputedText
The special logic for PrecomputedText in BoringLayout has problem.
The special logic is no longer necessary since TextLine is now aware of
PrecomputedText. So, just removing special logic from BoringLayout.
On the other hand, the metrics parameters check in TextLine has removed
Ie73bce52c6c673cda58973ddad04627a7cf2e5e9, but that was wrong. TextLine
can be used by BoringLayout too. Thus, need to reject PrecomputedText
if the given TextPaint is not compatible with given param.
Bug:
76227465
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
Change-Id: I172b5f655402e797b53b9667b49cb4ab89ec0dc0
Android Build Merger (Role) [Sat, 24 Mar 2018 01:17:12 +0000 (01:17 +0000)]
Merge "Merge "Pass all relevant resolver info to netd" am:
76f64641bb am:
3ce3bc4582" into pi-dev-plus-aosp
Erik Kline [Sat, 24 Mar 2018 01:16:37 +0000 (01:16 +0000)]
Merge "Pass all relevant resolver info to netd" am:
76f64641bb
am:
3ce3bc4582
Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Matthew Ng [Sat, 24 Mar 2018 01:15:33 +0000 (01:15 +0000)]
Merge "Remove quick switch and simplify quickstep code for scrub" into pi-dev
am:
f15f291777
Change-Id: Idcf30a15a5a94cce655cde27dfb663533f230108
TreeHugger Robot [Sat, 24 Mar 2018 01:12:49 +0000 (01:12 +0000)]
Merge "Unhide ImsReasonInfo Constructor" into pi-dev
Robert Carr [Sat, 24 Mar 2018 01:12:02 +0000 (01:12 +0000)]
Merge "Fix SurfaceView Background" into pi-dev
am:
e3d2c41344
Change-Id: I95471b28f40446925c41a3a332f324168bbe0309
Erik Kline [Sat, 24 Mar 2018 01:07:10 +0000 (01:07 +0000)]
Merge "Pass all relevant resolver info to netd"
am:
76f64641bb
Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
Wale Ogunwale [Sat, 24 Mar 2018 01:06:06 +0000 (01:06 +0000)]
Merge "Make Assistant stack invisible behind split-screen stacks." into pi-dev
Stanley Tng [Fri, 23 Mar 2018 23:03:28 +0000 (16:03 -0700)]
Add new strings for Hearing Aid profile
These new strings will be used by the Settings App for the hearing aid
profile.
Test: compiled.
Bug:
74204427
Change-Id: Ia5e07c094f3b7917176e10b920eee7ab9eda3d2f
Brad Ebinger [Sat, 24 Mar 2018 01:03:41 +0000 (01:03 +0000)]
Merge "Parse SMS locally upon error to get message ref" into pi-dev
am:
2d108c3747
Change-Id: I3b75da909f1f07125c5696f7f9e525736732f3c1
Felipe Leme [Sat, 24 Mar 2018 00:53:12 +0000 (00:53 +0000)]
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev
am:
0049ec1410
Change-Id: I815bf3aa060005b8c3f0512e38042ae377c8e236
Suprabh Shukla [Fri, 23 Mar 2018 21:20:17 +0000 (14:20 -0700)]
Guarding collisions in TimeSparseArray
TimeSparseArray - used to store UsageEvents - can keep at most one event
per millisecond, which can result in an event being replaced by another
event that occurred close enough that the system records it at the same
millisecond.
Test: atest android.app.usage.TimeSparseArrayTest
Fixes:
73832306
Change-Id: I860a101ab098f65d5c5832758832f43572865690
Dmitry Dementyev [Sat, 24 Mar 2018 00:46:52 +0000 (17:46 -0700)]
Add missing @NonNull annotation to AndroidKeyStoreProvider method.
Bug:
73959762
Test: none
Change-Id: I2298c8fe0893032f374629a5af128474ba0f679c
Svet Ganov [Sat, 24 Mar 2018 00:40:24 +0000 (00:40 +0000)]
Merge "Notify all running users for global settings change" into pi-dev
am:
8a696e9e09
Change-Id: I706b6983ce8a8e1212a8e13f78c0c5ee4418d1bd
Dmitry Dementyev [Sat, 24 Mar 2018 00:36:58 +0000 (17:36 -0700)]
Add more NonNull annotations to RecoveryController API
Bug:
73959762
Test: none
Change-Id: I648c20a099d4ac1c002f4f467d7189a8bc019560
Hall Liu [Sat, 24 Mar 2018 00:31:02 +0000 (00:31 +0000)]
Merge "Split the DownloadStateCallback class into two" into pi-dev
am:
ecd4709573
Change-Id: I09cdcd69729ac917ac7290d4e1efcf4d9dbc0530
TreeHugger Robot [Sat, 24 Mar 2018 00:29:04 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 00:28:32 +0000 (00:28 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Alan Viverette [Wed, 21 Mar 2018 19:07:32 +0000 (15:07 -0400)]
DO NOT MERGE Clean up SettingsLib dependencies
v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds
Bug:
73250914
Bug:
74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b
Mady Mellor [Sat, 24 Mar 2018 00:22:37 +0000 (00:22 +0000)]
Merge "Add string for 'snooze' action to use in local context menu" into pi-dev
am:
3aa86b427f
Change-Id: Ia9e71131a1ab779bedd6e25163e3f6448abc00c0
Salvador Martinez [Sat, 24 Mar 2018 00:15:51 +0000 (00:15 +0000)]
Merge "Revert the low battery warning title to previous version." into pi-dev
am:
d784f16950
Change-Id: Ia21cbd88e1000215f90f53fce9763551e9995e42
Dmitry Dementyev [Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)]
Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
Felipe Leme [Sat, 24 Mar 2018 00:03:23 +0000 (00:03 +0000)]
Merge "Properly set input type on autofill compat mode." into pi-dev
am:
352da45bbb
Change-Id: I7b97497e1d4dfb755e4f49182e27251356d9c372
Selim Cinek [Fri, 23 Mar 2018 23:54:33 +0000 (23:54 +0000)]
Merge "Fix AOD styling when pulsing" into pi-dev
am:
8d114ef8ae
Change-Id: Ib44bb4d340dc884653b501efe2e82ee1950d1534
Chong Zhang [Fri, 23 Mar 2018 23:46:53 +0000 (23:46 +0000)]
Merge "insert exif info for HEIF files" into pi-dev
am:
01aaabdea5
Change-Id: Id85a7f7b3e9171376b99c3b07011695e3b58863b
Treehugger Robot [Fri, 23 Mar 2018 23:41:11 +0000 (23:41 +0000)]
Merge "Pass all relevant resolver info to netd"
Todd Kopriva [Fri, 23 Mar 2018 23:36:28 +0000 (23:36 +0000)]
Merge "Merge "docs: fixing bug
36982027 and
30636712, typos" into oc-mr1-dev am:
5b0a4eea8d" into pi-dev
am:
ba22b7f4fd
Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
Andrii Kulian [Fri, 23 Mar 2018 23:36:02 +0000 (23:36 +0000)]
Merge "Revert "Use transaction for local activity relaunch"" into pi-dev
Wale Ogunwale [Fri, 23 Mar 2018 23:32:54 +0000 (23:32 +0000)]
Merge "Don't show unsupported sdk warning in test harness." into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 22:18:33 +0000 (15:18 -0700)]
Remove unimplemented RecoverableKeystoreManager APIs.
Add some Nullable annotations.
Bug:
75952916,
74859770
Test: apct
Change-Id: I25710263a1ba806d49ec11638dab00f3513631a8
TreeHugger Robot [Fri, 23 Mar 2018 23:28:17 +0000 (23:28 +0000)]
Merge "Remove quick switch and simplify quickstep code for scrub" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:21:04 +0000 (23:21 +0000)]
Merge "Fix SurfaceView Background" into pi-dev
Brad Ebinger [Fri, 23 Mar 2018 23:19:26 +0000 (23:19 +0000)]
Merge "Parse SMS locally upon error to get message ref" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:18:27 +0000 (23:18 +0000)]
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev
OSDN Git Service
