OSDN Git Service
Mathieu Chartier [Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)]
Merge "Add logic for passing down CompactDex generation flag" am:
b5fb7e91d8
am:
bfe9675f6c
Change-Id: I3a008f4324767fc8d31d24ac7730774afffd549d
Mathieu Chartier [Wed, 7 Mar 2018 21:23:27 +0000 (21:23 +0000)]
Merge "Add logic for passing down CompactDex generation flag"
am:
b5fb7e91d8
Change-Id: Ia2f2e6b97c19a20c57a98c4191df0e631b342ae6
Seigo Nonaka [Wed, 7 Mar 2018 21:21:43 +0000 (21:21 +0000)]
Merge "Throw an exception in case of parameter mismatch of precomputed text" into pi-dev
am:
a4d970ea40
Change-Id: I588313c38683f0fcd003f77e909e23d6b3df83ce
Kenny Guy [Wed, 7 Mar 2018 21:07:04 +0000 (21:07 +0000)]
Merge "Ignore events when there is no focused stack." into pi-dev
am:
9c345022d1
Change-Id: I281142563c53e0b40b2784272dffedfc65a0dfb0
TreeHugger Robot [Wed, 7 Mar 2018 21:02:37 +0000 (21:02 +0000)]
Merge "Throw an exception in case of parameter mismatch of precomputed text" into pi-dev
Tyler Gunn [Wed, 7 Mar 2018 20:56:29 +0000 (20:56 +0000)]
Merge "API Documentation and Constant cleanup." am:
8882c55b21
am:
8917fc21cc
Change-Id: Ic4a159b838c952594b0860ded69fc07c74180961
TreeHugger Robot [Wed, 7 Mar 2018 20:50:26 +0000 (20:50 +0000)]
Merge "Ignore events when there is no focused stack." into pi-dev
Mathew Inwood [Wed, 7 Mar 2018 20:47:01 +0000 (20:47 +0000)]
Merge "Some more members for the light greylist." into pi-dev
am:
2dacab9844
Change-Id: Ia708cea9a0c847c5b8b0a17ebc504a4acdcc1ed8
Tyler Gunn [Wed, 7 Mar 2018 20:43:04 +0000 (20:43 +0000)]
Merge "API Documentation and Constant cleanup."
am:
8882c55b21
Change-Id: I9b29ba9beb91005dfd0df267d9ca21b0e858abad
TreeHugger Robot [Wed, 7 Mar 2018 20:34:50 +0000 (20:34 +0000)]
Merge "Some more members for the light greylist." into pi-dev
Tetsutoki Shiozawa [Wed, 7 Mar 2018 20:03:45 +0000 (20:03 +0000)]
Merge "Store package restriction settings at shutdown" am:
888c45b484
am:
f67b9f6dc0
Change-Id: I76f262397ea45c786ca489484e9877df7a757392
Felipe Leme [Wed, 7 Mar 2018 19:56:10 +0000 (19:56 +0000)]
Merge "Implemented notifyViewClicked() on compat mode." into pi-dev
am:
f99b1d8fd9
Change-Id: Iff367b925d93bb5796d13a048b1690e3477c5689
Mathieu Chartier [Wed, 7 Mar 2018 19:53:18 +0000 (19:53 +0000)]
Merge "Add logic for passing down CompactDex generation flag"
Tetsutoki Shiozawa [Wed, 7 Mar 2018 19:51:26 +0000 (19:51 +0000)]
Merge "Store package restriction settings at shutdown"
am:
888c45b484
Change-Id: I97ad69e56c6a3c32f9d530aed933b98a61d6daa4
TreeHugger Robot [Wed, 7 Mar 2018 19:40:55 +0000 (19:40 +0000)]
Merge "Implemented notifyViewClicked() on compat mode." into pi-dev
Nathan Harold [Wed, 7 Mar 2018 19:39:00 +0000 (19:39 +0000)]
Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev
am:
1a1dc60ff5 -s ours
Change-Id: Ibe66b17722c908bcc3e1ad8c6f80a9151491e776
Treehugger Robot [Wed, 7 Mar 2018 19:33:52 +0000 (19:33 +0000)]
Merge "API Documentation and Constant cleanup."
Nathan Harold [Wed, 7 Mar 2018 19:22:32 +0000 (19:22 +0000)]
Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev
* changes:
Update SignalStrength to use ASU for TD-SDCMA
Customize the WCDMA signal strength based on RSCP
Android Build Merger (Role) [Wed, 7 Mar 2018 19:15:23 +0000 (19:15 +0000)]
Merge "Merge "Address the API review comments." am:
322ff16301 am:
904826d293" into pi-dev-plus-aosp
yinxu [Wed, 7 Mar 2018 19:15:01 +0000 (19:15 +0000)]
Merge "Address the API review comments." am:
322ff16301
am:
904826d293
Change-Id: I4de5c601e23004c934684d995bb916b654a42247
Leon Scroggins [Wed, 7 Mar 2018 19:13:36 +0000 (19:13 +0000)]
Merge "Draw AnimatedImageDrawable mirrored if desired" into pi-dev
am:
e781724b41
Change-Id: I0ab5753074ec20b7c0600bcdb0d9f0e837951998
yinxu [Wed, 7 Mar 2018 19:02:46 +0000 (19:02 +0000)]
Merge "Address the API review comments."
am:
322ff16301
Change-Id: I4892b391672b0f125d47d9ddec02c1645d7cb2d3
Mathew Inwood [Wed, 7 Mar 2018 18:47:53 +0000 (18:47 +0000)]
Some more members for the light greylist.
Test: N/A
Bug:
74323509
Change-Id: I142b7f750470aa0cc49ff5f17866516014d615e6
Leon Scroggins [Wed, 7 Mar 2018 18:51:16 +0000 (18:51 +0000)]
Merge "Draw AnimatedImageDrawable mirrored if desired" into pi-dev
Treehugger Robot [Wed, 7 Mar 2018 18:46:18 +0000 (18:46 +0000)]
Merge "Store package restriction settings at shutdown"
Anton Hansson [Wed, 7 Mar 2018 18:46:17 +0000 (18:46 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
13310fef6e
am:
250e9629f3 -s ours
Change-Id: I0e22d56dad8dbf35799ffa839ddfdb90abf3f3c3
Anton Hansson [Wed, 7 Mar 2018 18:37:54 +0000 (18:37 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am:
13310fef6e
Change-Id: Idbd6c7575b15c68a34c75ae6e5a5dd5418cfab82
Makoto Onuki [Wed, 7 Mar 2018 18:33:12 +0000 (18:33 +0000)]
Merge "Avoid service wrapper initialization deadlock." into pi-dev
am:
1e36211a96
Change-Id: I1413c9f37c6ae189292def463e1621983e2f87f2
Seigo Nonaka [Thu, 1 Mar 2018 02:21:29 +0000 (18:21 -0800)]
Throw an exception in case of parameter mismatch of precomputed text
If the given precomputed text is not compatible with the TextView,
reject the text by throwing IllegalArgumentException.
Bug:
73091756
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
Change-Id: I4fbf89a5f1409e8eefdeb9f208f9a3758220fe1a
(cherry picked from commit
3a0787af5e1bb1f615c1dd2192a08464ea3776e3)
Salvador Martinez [Wed, 7 Mar 2018 18:28:34 +0000 (18:28 +0000)]
Merge "Fix duplicate text in battery string" into pi-dev
am:
13da2a778f
Change-Id: I42915c2b46b3763a6cf179599fc944a4e1339f8f
Jason Monk [Wed, 7 Mar 2018 18:22:24 +0000 (18:22 +0000)]
Merge "Remove BIND_SLICE" into pi-dev
am:
23b73c45fb
Change-Id: I7a1e727f3a69b6e98c06505ac42c5927e7e3cc67
Chavi Weingarten [Wed, 7 Mar 2018 18:12:09 +0000 (18:12 +0000)]
Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev
am:
34ab4d95ca
Change-Id: I47c4bd38b6057c731e4d60c08ec378de12df9a69
TreeHugger Robot [Wed, 7 Mar 2018 18:11:15 +0000 (18:11 +0000)]
Merge "Avoid service wrapper initialization deadlock." into pi-dev
Tyler Gunn [Wed, 7 Mar 2018 18:06:52 +0000 (18:06 +0000)]
Merge "Ensure start of call properties are propagated to RemoteConnection." am:
ecb46b610c
am:
e8cb4f4046
Change-Id: I63af850b4bea2a8cfeada3cb7bf4d16762604524
TreeHugger Robot [Wed, 7 Mar 2018 18:02:27 +0000 (18:02 +0000)]
Merge "Fix duplicate text in battery string" into pi-dev
Jason Monk [Wed, 7 Mar 2018 18:01:26 +0000 (18:01 +0000)]
Merge "Remove BIND_SLICE" into pi-dev
Chavi Weingarten [Wed, 7 Mar 2018 17:57:19 +0000 (17:57 +0000)]
Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev
Tyler Gunn [Wed, 7 Mar 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Ensure start of call properties are propagated to RemoteConnection."
am:
ecb46b610c
Change-Id: I9e7e28c7197d8d002bb5d8956ef4624ac70cb24b
Lucas Dupin [Wed, 7 Mar 2018 17:52:17 +0000 (17:52 +0000)]
Merge "Disable color extraction for media" into pi-dev
am:
20ebb0a6d8
Change-Id: I02b9056b783fbbe95d8d641b908d9630408a76dd
Richard Ledley [Wed, 7 Mar 2018 17:42:02 +0000 (17:42 +0000)]
Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev
am:
847446d7f8
Change-Id: I1ad63dda26b397c26fa05520103e504bcf6f8127
Treehugger Robot [Wed, 7 Mar 2018 17:40:20 +0000 (17:40 +0000)]
Merge "Address the API review comments."
Lucas Dupin [Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)]
Merge "Disable color extraction for media" into pi-dev
Richard Ledley [Wed, 7 Mar 2018 17:30:20 +0000 (17:30 +0000)]
Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev
Felipe Leme [Tue, 6 Mar 2018 20:54:31 +0000 (12:54 -0800)]
Implemented notifyViewClicked() on compat mode.
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityCompatModeTest#testSave_submitButtonClicked
Fixes:
73649008
Change-Id: Icf6a8b617e06055c58e38c5b7208c7f3ef3121ee
Mathieu Chartier [Wed, 7 Mar 2018 02:28:22 +0000 (18:28 -0800)]
Add logic for passing down CompactDex generation flag
In the cases where we are not install, boot, or first boot, pass down
the flag to generate CompactDex.
Bug:
63756964
Bug:
74245837
Test: manual
Change-Id: I4a2ff9383251e67b260cff5ec8a326c7a4f7faca
Annie Meng [Wed, 7 Mar 2018 17:17:54 +0000 (17:17 +0000)]
Merge "Validate restore of NetworkPolicy settings" into pi-dev
am:
292d895fb2
Change-Id: I0337e151e8a47d413153160081e640b49f945318
Annie Meng [Wed, 7 Mar 2018 17:07:51 +0000 (17:07 +0000)]
Merge "Validate restore of NetworkPolicy settings" into pi-dev
Beverly [Wed, 7 Mar 2018 16:53:11 +0000 (16:53 +0000)]
Merge "System sounds get its own dnd toggle" into pi-dev
am:
5a169cf2f6
Change-Id: Ie4b15e59d2f9ab16842af48ef07fc85191330a1a
Anton Hansson [Wed, 7 Mar 2018 16:46:58 +0000 (16:46 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
TreeHugger Robot [Wed, 7 Mar 2018 16:39:40 +0000 (16:39 +0000)]
Merge "System sounds get its own dnd toggle" into pi-dev
Rubin Xu [Wed, 7 Mar 2018 16:37:49 +0000 (16:37 +0000)]
Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev
am:
a3e2d2fed8
Change-Id: I9020605036fbb994c33724e60f324167cd9aaccd
TreeHugger Robot [Wed, 7 Mar 2018 16:27:14 +0000 (16:27 +0000)]
Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev
Kenny Guy [Mon, 26 Feb 2018 14:11:40 +0000 (14:11 +0000)]
Ignore events when there is no focused stack.
Skip brightness slider events when there is no
focused activity stack.
Bug:
73825714
Test: atest SystemUIGoogleTests
Test: atest BrightnessTrackerTest
Change-Id: I87376bbab47545dbcd9be684d1c8174fc9c8d92f
Tobias Thierer [Wed, 7 Mar 2018 16:02:34 +0000 (16:02 +0000)]
Merge "Remove com.android.internal{.util} from generated documentation." into pi-dev
am:
6e0e705844
Change-Id: Id25c8b1d780c940690adc3c1e0276a0bf0fa3033
Evan Laird [Wed, 7 Mar 2018 15:56:47 +0000 (15:56 +0000)]
Merge "Fix extra padding when there are no static notification dots" into pi-dev
am:
bb9bd1215a
Change-Id: I10265707ea93b4518088b9f10ce4a1007a731108
TreeHugger Robot [Wed, 7 Mar 2018 15:55:22 +0000 (15:55 +0000)]
Merge "Remove com.android.internal{.util} from generated documentation." into pi-dev
Alison Cichowlas [Wed, 7 Mar 2018 15:45:55 +0000 (15:45 +0000)]
Merge "Screenshots: delete, default for edit intent." into pi-dev
am:
b16f1f049b
Change-Id: I39734a647b16fcbbe9a9980237bcbdfa37b4f87d
TreeHugger Robot [Wed, 7 Mar 2018 15:41:18 +0000 (15:41 +0000)]
Merge "Fix extra padding when there are no static notification dots" into pi-dev
Wale Ogunwale [Wed, 7 Mar 2018 15:30:58 +0000 (15:30 +0000)]
Merge "Removed @FlakyTest from ScreenDecorWindowTests" into pi-dev
am:
0b7011581f
Change-Id: I2b0bc942027b9f09974bf638083cda2af68ca58d
TreeHugger Robot [Wed, 7 Mar 2018 15:30:23 +0000 (15:30 +0000)]
Merge "Screenshots: delete, default for edit intent." into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 15:23:15 +0000 (15:23 +0000)]
Merge "Removed @FlakyTest from ScreenDecorWindowTests" into pi-dev
Tyler Gunn [Wed, 7 Mar 2018 15:22:58 +0000 (15:22 +0000)]
Merge "Ensure start of call properties are propagated to RemoteConnection."
Anton Hansson [Fri, 23 Feb 2018 12:57:51 +0000 (12:57 +0000)]
frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Exempt-From-Owner-Approval: Global cleanup
Change-Id: I66b515d98d03264dbb893b7c55ba7bdddfb447a1
Merged-In: I26458e41ecb84de91ac9a356a5d4bafb44f463c1
Merged-In: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
Merged-In: I72ce7f1c6242ddf9a5b36075761f3f1f1138cea1
Tobias Thierer [Wed, 7 Mar 2018 14:52:52 +0000 (14:52 +0000)]
Merge "Remove com.android.internal{.util} from generated documentation." am:
29da54462d
am:
81f5820589
Change-Id: I741c4d2e748005dba85d8afa9ef12a803dd2e6c2
Tobias Thierer [Wed, 7 Mar 2018 14:39:05 +0000 (14:39 +0000)]
Merge "Remove com.android.internal{.util} from generated documentation."
am:
29da54462d
Change-Id: Ibdd68ab3b14e7c0280e2474248398e375e806088
Rubin Xu [Fri, 2 Mar 2018 15:25:28 +0000 (15:25 +0000)]
Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration
Fixes:
36887130
Test: builds
Change-Id: Ieccd3edc0122c9ae49903a3c5fc9fb0aba6c08a2
Wale Ogunwale [Wed, 7 Mar 2018 14:09:51 +0000 (14:09 +0000)]
Merge "Fix issue with where display is removed while creating it in AM and WM" into pi-dev
am:
91059cdfc9
Change-Id: I07ccee8beb33eb3de320822e572e32a779365e5c
Anton Hansson [Wed, 7 Mar 2018 14:04:51 +0000 (14:04 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev
am:
d740e43bf7
Change-Id: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
Wale Ogunwale [Wed, 7 Mar 2018 13:59:07 +0000 (13:59 +0000)]
Merge "Fix issue with where display is removed while creating it in AM and WM" into pi-dev
Tobias Thierer [Mon, 5 Mar 2018 22:55:32 +0000 (22:55 +0000)]
Remove com.android.internal{.util} from generated documentation.
com.android.internal.* is meant to be hidden from documentation,
but most of it is erroneously not hidden via @hide or -hidePackage
directives; why documentation is currently generated for Predicate
but not other classes from com.android.internal.util, and why some
but not all classes from that package show up in package-level
documentation (package-summary.html), is not currently understood.
There appears to be a behavior difference between OpenJDK 8 and
OpenJDK 9's javadoc that results in additional classes showing up
in package-summary.html. This CL fixes this by adding -hidePackage
directives for com.android.internal{.util}; other sub-packages of
com.android.internal do not currently show up in documentation and
are not touched by this CL.
Test: Patched this CL into the internal-master branch and ran:
USE_R8=true EXPERIMENTAL_USE_OPENJDK9=true make offline-sdk-docs
Checked that this removes all documentation for com.*
(com.android.internal.util was the only com.* package for which
documentation was previously generated).
In other words: Before this CL, [1] existed, but after
this CL, the entire directory subtree [2] does not exist.
Test: Checked that Predicate was already missing from stubs before this
CL. In other words, [3] already did not exist before this CL.
[1] out/target/common/docs/offline-sdk/reference/com/android/internal/util/Predicate.html
[2] out/target/common/docs/offline-sdk/reference/com
[3] out/target/common/obj/JAVA_LIBRARIES/android_system_stubs_current_intermediates/classes/com
Bug:
69736344
Bug:
69736236
(cherry picked from commit
97bb6cf371f51549c708cf58a04584968eaf7d5a)
Merged-In: Ic9757f4966f54092aac0191896581fa4222cc634
Change-Id: Ic9757f4966f54092aac0191896581fa4222cc634
Yueming Wang [Wed, 7 Mar 2018 13:54:19 +0000 (13:54 +0000)]
Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev
am:
aecd9616ec
Change-Id: I1adecc989ee77fe578e08b484edc57669937df99
Anton Hansson [Wed, 7 Mar 2018 13:48:23 +0000 (13:48 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev
Yueming Wang [Wed, 7 Mar 2018 13:45:35 +0000 (13:45 +0000)]
Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev
Wale Ogunwale [Wed, 7 Mar 2018 04:07:39 +0000 (20:07 -0800)]
Removed @FlakyTest from ScreenDecorWindowTests
Issues causing test to be flaky have been fixed.
Change-Id: Ie167c89bf32d24adb20766d2a36773b3f268d9ee
Fixes:
68957554
Test: this
Jaewan Kim [Wed, 7 Mar 2018 11:44:29 +0000 (11:44 +0000)]
Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev
am:
aa79f03ca6
Change-Id: Id0752a1ddada27d43ff8da59b2ae0b96dd92d29c
Treehugger Robot [Wed, 7 Mar 2018 11:43:35 +0000 (11:43 +0000)]
Merge "Remove com.android.internal{.util} from generated documentation."
Anton Hansson [Fri, 23 Feb 2018 12:57:51 +0000 (12:57 +0000)]
frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Exempt-From-Owner-Approval: Global cleanup
Change-Id: I26458e41ecb84de91ac9a356a5d4bafb44f463c1
TreeHugger Robot [Wed, 7 Mar 2018 11:23:29 +0000 (11:23 +0000)]
Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev
yuemingw [Tue, 30 Jan 2018 17:27:54 +0000 (17:27 +0000)]
Block adb from changing certain settings value when corresponding user
restriction is on.
Check calling uid in isSettingRestrictedForUser(which is called by settingsprovider),
and only allow system_uid when certain user restriction is on, so that user won't be
able to change these settings with adb:
Settings.Secure.LOCATION_MODE,
Settings.Secure.PROVIDERS_ALLOWED,
Settings.System.SCREEN_BRIGHTNESS,
Settings.System.SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_OFF_TIMEOUT,
Settings.Global.AUTO_TIME,
Settings.Global.AUTO_TIME_ZONE.
This check also prevents 3rd party apps from modifying system settings value
when corresponding user restriction is on.
In addition, any attempt to change AUTO_TIME will also go through the check
for dpm.getAutoTimeRequired().
Test: manually by running the adb command with restriction set and not set
Bug:
72549013
Bug:
72548203
Bug:
72548533
Bug:
72686466
Bug:
72687105
Bug:
72940551
Bug:
72940562
Change-Id: I1d1fd20d9fa0f76f27905d62873f6a6e9af0224e
Tetsutoki Shiozawa [Wed, 25 Nov 2015 14:02:36 +0000 (23:02 +0900)]
Store package restriction settings at shutdown
Symptom:
Disabled package was re-enabled by restarting a device.
Root cause:
PMS postpones storing the package restriction settings in 10
seconds by design. When a package gets disabled right before
shutdown, PMS fails to store the last changes.
Solution:
Store package restriction settings at shutdown.
BUG:
73447744
Change-Id: I4fe76c1f003e51653304cfaeaa5129d84803ce1e
Sungsoo Lim [Wed, 7 Mar 2018 08:20:58 +0000 (08:20 +0000)]
Merge changes from topics "mplc", "session2_onDataSourceMissingHelper" into pi-dev
am:
be1033fda2
Change-Id: Ib9c2dfe21f3572eab3027c2a6e8040880b6777d4
Jaewan Kim [Wed, 7 Mar 2018 08:16:27 +0000 (08:16 +0000)]
MediaSession2: Add SessionCallback#onCurrentMediaItemChanged()
am:
87086f59ad
Change-Id: I5861b8b3d24546b0064ddd7547da6b8906385c6c
Jaewan Kim [Wed, 7 Mar 2018 08:12:02 +0000 (08:12 +0000)]
MediaSession2: Add onDataSourceMissingHelper
am:
4d4a8c95ae
Change-Id: I9342ba46a9a88ff8a282816a7d492fa0ea439020
Sungsoo Lim [Wed, 7 Mar 2018 07:59:53 +0000 (07:59 +0000)]
Merge changes from topics "mplc", "session2_onDataSourceMissingHelper" into pi-dev
* changes:
Remove MediaPlaylistController, add MediaPlaylistAgent
MediaSession2: Add SessionCallback#onCurrentMediaItemChanged()
MediaSession2: Add onDataSourceMissingHelper
Sungsoo Lim [Wed, 7 Mar 2018 04:09:36 +0000 (13:09 +0900)]
Remove MediaPlaylistController, add MediaPlaylistAgent
MediaPlaylistAgent is the abstract class an application needs to
derive from to pass an object to a MediaSession2 that will override
default playlist handling behaviors. It contains a set of notify*
methods to signal MediaSession2 that playlist-related state has
changed.
Bug:
64098437
Test: make update-api
Change-Id: Icb3c57ddc14eba276f49d4ba85f11adbeb3e0917
Jaewan Kim [Wed, 7 Mar 2018 06:16:55 +0000 (15:16 +0900)]
MediaSession2: Add SessionCallback#onCurrentMediaItemChanged()
Added callback for session to know the currently playing media item has
changed.
Note that the callback is called in response to the
MediaPlayerBase#PlayerEventCallback#onCurrentDataSourceChanged(mpb, dsd
is called. Session will translate dsd to the media item and calls
onCurrentMediaItemChanged().
Following changes are also included
- Removed MediaPlaylistController#getCurrentPlaylistItem(),
because currently playing item is managed by the MediaPlayerBase.
- Renamed ControllerCallback#onCurrentPlaylistItemChanged() to the
ControllerCallback#onCurrentMediaItemChanged(), to make it more
obvious that the event is from MediaPlayerBase, not
MediaPlaylistController.
- Added SessionCallback#onCurrentMediaItemChanged()
Bug:
64098437
Test: Run MediaComponents test
Change-Id: I78b124a7da0f968b097b2576507b9a73e36081ec
Jaewan Kim [Tue, 6 Mar 2018 05:43:10 +0000 (14:43 +0900)]
MediaSession2: Add onDataSourceMissingHelper
This allows a developer to create DataSourceDesc when the item is about
to be played. Typical example of the usages are,
1. For a playlist consists of FileDescriptors, its developer may not
want to open all files when MediaSession2.setPlaylist() is
called.
2. A controller has called setPlaylist(), addPlaylistItem(), or
replacePlaylistItem(). Controller cannot know the
DataSourceDesc, and only the session developer can know about
it.
Bug:
64098437
Test: Run MediaComponents test
Change-Id: I73f27ca0a799b1cddf5046b41f0ca01d08037103
Andreas Gampe [Wed, 7 Mar 2018 05:01:53 +0000 (05:01 +0000)]
Merge "Connectivity: Fix map access" into pi-dev
am:
1fff4c000d -s ours
Change-Id: I03b95b31613c6cfd702497e822c5690f78547b21
TreeHugger Robot [Wed, 7 Mar 2018 04:53:07 +0000 (04:53 +0000)]
Merge "Connectivity: Fix map access" into pi-dev
Robert Shih [Wed, 7 Mar 2018 04:38:05 +0000 (04:38 +0000)]
Merge "MediaPlayer2: embed header in uri" into pi-dev
am:
c943614f2c
Change-Id: I78358d08bb89327f85480d14e2fb265a3a7e304d
Lucas Dupin [Wed, 7 Mar 2018 04:27:50 +0000 (20:27 -0800)]
Disable color extraction for media
Overlaying an album with wallpaper colors isn't optimal.
Using the album extracted color also isn't optimal, the color probably
won't meet accessibility guidelines and will have to be stretched
according to the current lock screen theme - which can be even worse.
Test: atest packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: I53d08713716bd76ee0975c2b4bba5b933201f999
TreeHugger Robot [Wed, 7 Mar 2018 04:26:18 +0000 (04:26 +0000)]
Merge "MediaPlayer2: embed header in uri" into pi-dev
Hall Liu [Wed, 7 Mar 2018 04:16:21 +0000 (04:16 +0000)]
Merge "Fix Telecom dumpsys timestamps" into pi-dev
am:
8c76ca0341
Change-Id: Iafd530ca9dd02fb67e2bc96e961e738168c823f4
Holly Jiuyu Sun [Wed, 7 Mar 2018 04:08:12 +0000 (04:08 +0000)]
Merge "Remove toString() for CarrierIdentifier." into pi-dev
am:
1eb1ff31fc -s ours
Change-Id: I6b5547a9cf25f4891182d743d4afad53d413b7a1
TreeHugger Robot [Wed, 7 Mar 2018 03:52:28 +0000 (03:52 +0000)]
Merge "Fix Telecom dumpsys timestamps" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 03:44:31 +0000 (03:44 +0000)]
Merge "Remove toString() for CarrierIdentifier." into pi-dev
jackqdyulei [Wed, 7 Mar 2018 03:29:05 +0000 (03:29 +0000)]
Merge "Add APP_AUTO_RESTRICTION_ENABLED" into pi-dev
am:
9aa32d0e71
Change-Id: I79ad9035fcbbf0935e547b518d5a937400aa2a4c
nharold [Wed, 7 Mar 2018 03:21:17 +0000 (03:21 +0000)]
Merge "Update SignalStrength to use ASU for TD-SDCMA" am:
4068e8e6ae
am:
132c80dff5
Change-Id: I3a810d4b28461a4dd680c5bfa5966bf7d525654c
Suprabh Shukla [Wed, 7 Mar 2018 03:14:03 +0000 (03:14 +0000)]
Merge "Changing Slog.wtf to Slog.w" into pi-dev
am:
1c22ed2712
Change-Id: I526d9c1dc60be6dfaf2500e4ca1d48d704218d57
nharold [Wed, 7 Mar 2018 03:12:01 +0000 (03:12 +0000)]
Merge "Update SignalStrength to use ASU for TD-SDCMA"
am:
4068e8e6ae
Change-Id: Iac579d6eb416b6aca260b0f4e79f311b059d8466