OSDN Git Service
Donghui Han [Thu, 21 Mar 2019 17:45:10 +0000 (17:45 +0000)]
Merge "Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)""
Donghui Han [Thu, 21 Mar 2019 17:41:16 +0000 (17:41 +0000)]
Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)"
This reverts commit
4ca5e6c596526395dadfc7680d2ebed284b65616.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I75ed57659ec5b847ce630cd4e7e03ab07bd2a3bc
Nathan Harold [Thu, 21 Mar 2019 17:23:19 +0000 (17:23 +0000)]
Merge "Expose CellInfoTdscdma"
Mady Mellor [Thu, 21 Mar 2019 17:18:38 +0000 (17:18 +0000)]
Merge "Documentation & refinements around BubbleMetadata#setIcon API"
TreeHugger Robot [Thu, 21 Mar 2019 16:59:21 +0000 (16:59 +0000)]
Merge "Add tool tip view for first run of volume dialog to notify users of odi captions functionality."
TreeHugger Robot [Thu, 21 Mar 2019 16:56:15 +0000 (16:56 +0000)]
Merge "Use correct type for permission group name."
Kweku Adams [Thu, 21 Mar 2019 16:55:51 +0000 (16:55 +0000)]
Merge "Adding notification when sticky battery saver is automatically disabled."
Dongwon Kang [Thu, 21 Mar 2019 16:45:01 +0000 (16:45 +0000)]
Merge "Consolidate builder classes for DataSourceDesc"
TreeHugger Robot [Thu, 21 Mar 2019 16:40:52 +0000 (16:40 +0000)]
Merge "Solve inflated view/cached view inconsistency"
Anil Admal [Thu, 21 Mar 2019 16:40:12 +0000 (16:40 +0000)]
Merge "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)"
TreeHugger Robot [Thu, 21 Mar 2019 16:38:10 +0000 (16:38 +0000)]
Merge "idmap2: move Idmap.h to Result"
TreeHugger Robot [Thu, 21 Mar 2019 16:37:39 +0000 (16:37 +0000)]
Merge changes from topic "ongoing-usage-dialog-migration"
* changes:
Launch external ongoing usage dialog instead of internal one.
Add an API to launch the ongoing usage dialog.
Wonsik Kim [Thu, 21 Mar 2019 16:29:26 +0000 (16:29 +0000)]
Merge "media: add MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES"
TreeHugger Robot [Thu, 21 Mar 2019 16:24:48 +0000 (16:24 +0000)]
Merge "Modify DeviceConfigServiceTest to match actual DeviceConfig reset method behavior."
Chad Brubaker [Thu, 21 Mar 2019 16:23:31 +0000 (16:23 +0000)]
Merge "Add location backed system clock"
TreeHugger Robot [Thu, 21 Mar 2019 16:04:04 +0000 (16:04 +0000)]
Merge "User std::vector over Vector for InputFlinger (2/3)"
Zimuzo Ezeozue [Thu, 21 Mar 2019 16:03:05 +0000 (16:03 +0000)]
Merge "Add CONTROL_KEYGUARD_SECURE_NOTIFICATIONS to shell app"
Etan Cohen [Thu, 21 Mar 2019 15:54:02 +0000 (15:54 +0000)]
Merge "[AWARE] Update Aware NetworkSpecifier API per API council feedback"
TreeHugger Robot [Thu, 21 Mar 2019 15:52:22 +0000 (15:52 +0000)]
Merge "Fix issues with RollbackTest"
lucaslin [Thu, 21 Mar 2019 15:39:31 +0000 (08:39 -0700)]
Merge "Temporarily disable flaky test." am:
775d11c988 am:
6962eea7c7
am:
294150afe2
Change-Id: I583ed9aa0e42e864ef0c1e74fbcd9357e093cc25
lucaslin [Thu, 21 Mar 2019 15:29:50 +0000 (08:29 -0700)]
Merge "Temporarily disable flaky test." am:
775d11c988
am:
6962eea7c7
Change-Id: Iec5d70ab6e5afff9ce2a633aa5a1316fa94ef9ad
Julia Reynolds [Thu, 21 Mar 2019 15:29:10 +0000 (15:29 +0000)]
Merge "Allow delegates to read target app notification channels"
lucaslin [Thu, 21 Mar 2019 15:19:47 +0000 (08:19 -0700)]
Merge "Temporarily disable flaky test."
am:
775d11c988
Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b
Treehugger Robot [Thu, 21 Mar 2019 15:04:15 +0000 (15:04 +0000)]
Merge "Temporarily disable flaky test."
TreeHugger Robot [Thu, 21 Mar 2019 14:59:22 +0000 (14:59 +0000)]
Merge "Add some strings for bubbles; update permission prompt string"
Paul Hu [Thu, 21 Mar 2019 14:49:37 +0000 (07:49 -0700)]
Merge "Fix Automated API Review issues." am:
814bb8f627 am:
69aa833953
am:
a6c364d805
Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6
Paul Hu [Thu, 21 Mar 2019 14:33:48 +0000 (07:33 -0700)]
Merge "Fix Automated API Review issues." am:
814bb8f627
am:
69aa833953
Change-Id: I29f4cb581574f2542d461de6a0939e58bfc88059
Remi NGUYEN VAN [Thu, 21 Mar 2019 14:31:08 +0000 (07:31 -0700)]
Merge "Define DhcpErrorEvent constants at compile time" am:
5803191975 am:
a0b2076f75
am:
e229cc2c95
Change-Id: I47dac7870289bce6763c1d778c2e8aeb77741666
Anthony Tripaldi [Mon, 18 Mar 2019 15:47:52 +0000 (11:47 -0400)]
Add tool tip view for first run of volume dialog to notify users of odi
captions functionality.
Bug:
128970574
Change-Id: I4710fd1d84f4116e003c14720a2ce55c5b3ff899
Test: manual
Paul Hu [Thu, 21 Mar 2019 14:24:16 +0000 (07:24 -0700)]
Merge "Fix Automated API Review issues."
am:
814bb8f627
Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e
Remi NGUYEN VAN [Thu, 21 Mar 2019 14:19:33 +0000 (07:19 -0700)]
Merge "Define DhcpErrorEvent constants at compile time" am:
5803191975
am:
a0b2076f75
Change-Id: Iada7c4e80233ea451b88bba2cf81bdfad225fe09
TreeHugger Robot [Thu, 21 Mar 2019 14:16:28 +0000 (14:16 +0000)]
Merge changes from topic "whichless"
* changes:
BatteryStats remove which - log warnings
LongSamplingCounter - remove update()
Remove which from BatteryStats
Paul Hu [Thu, 21 Mar 2019 14:11:36 +0000 (14:11 +0000)]
Merge "Fix Automated API Review issues."
Remi NGUYEN VAN [Thu, 21 Mar 2019 14:09:14 +0000 (07:09 -0700)]
Merge "Define DhcpErrorEvent constants at compile time"
am:
5803191975
Change-Id: I6ccc8d92c5742422fc29da1fe15d6108d036b72f
Remi NGUYEN VAN [Thu, 21 Mar 2019 13:57:18 +0000 (13:57 +0000)]
Merge "Define DhcpErrorEvent constants at compile time"
Todd Kennedy [Thu, 21 Mar 2019 13:43:34 +0000 (13:43 +0000)]
Merge "idmap2: clang-format"
TreeHugger Robot [Thu, 21 Mar 2019 13:41:27 +0000 (13:41 +0000)]
Merge "Add getter to AudioPlaybackCaptureConfiguration"
Julia Reynolds [Wed, 20 Mar 2019 19:46:08 +0000 (15:46 -0400)]
Allow delegates to read target app notification channels
Test: cts, atest
Fixes:
128852206
Change-Id: I12ddfbdf6f520d29a8ea5fe8e0581bc425c1638b
Andrei-Valentin Onea [Thu, 21 Mar 2019 13:22:55 +0000 (13:22 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"
Julia Reynolds [Thu, 21 Mar 2019 13:09:00 +0000 (13:09 +0000)]
Merge "Add the ability to turn off NAS capabilities individually"
Mark Chien [Thu, 21 Mar 2019 12:35:15 +0000 (05:35 -0700)]
Merge "Replace TcpSocketInfo with similar structure" am:
a34aa2acab am:
43411c851d
am:
840623e94e
Change-Id: I9b51e6905245ada2707ef7498cc1b8e4cb4c69a0
TreeHugger Robot [Thu, 21 Mar 2019 12:31:30 +0000 (12:31 +0000)]
Merge "Remove unused @InspectableNodeName"
Mark Chien [Thu, 21 Mar 2019 12:24:03 +0000 (05:24 -0700)]
Merge "Replace TcpSocketInfo with similar structure" am:
a34aa2acab
am:
43411c851d
Change-Id: I8ce393e01d48d87deefc0ac9e8c041224b6d4bae
TreeHugger Robot [Thu, 21 Mar 2019 12:16:17 +0000 (12:16 +0000)]
Merge "Clarify MediaProjection message"
Mark Chien [Thu, 21 Mar 2019 12:14:45 +0000 (05:14 -0700)]
Merge "Replace TcpSocketInfo with similar structure"
am:
a34aa2acab
Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed
Mark Chien [Thu, 21 Mar 2019 12:02:54 +0000 (12:02 +0000)]
Merge "Replace TcpSocketInfo with similar structure"
lucaslin [Thu, 21 Mar 2019 11:14:32 +0000 (19:14 +0800)]
Temporarily disable flaky test.
Test: None
Bug:
128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f
Richard Uhler [Thu, 21 Mar 2019 09:14:38 +0000 (09:14 +0000)]
Fix issues with RollbackTest
* Add missing permission needed in testBadUpdateRollback test.
* Re-enable testRollbackWithSplits test now that the build issues have
been sorted out.
Bug:
127920549
Test: atest RollbackTest
Change-Id: I5bd70aea4f1ad0345d7a37e78c0f3b5ef0615ed1
Stanislav Zholnin [Tue, 19 Mar 2019 17:37:55 +0000 (17:37 +0000)]
Modify DeviceConfigServiceTest to match actual DeviceConfig reset method behavior.
Test: atest SettingsProviderTest
Change-Id: I2c21f118e2822e2033b8e4394109242d4b1e1203
Annie Meng [Thu, 21 Mar 2019 10:17:09 +0000 (10:17 +0000)]
Merge "API Review: Make dataManagementLabel a CharSequence"
TreeHugger Robot [Thu, 21 Mar 2019 09:47:12 +0000 (09:47 +0000)]
Merge "AudioMix: Do not compare rules of different types"
Wu Ahan [Thu, 21 Mar 2019 09:03:28 +0000 (09:03 +0000)]
Merge "Release the bitmap reference and textures when user changes the wallpaper."
Colin Cross [Thu, 21 Mar 2019 08:44:16 +0000 (01:44 -0700)]
Merge "Fix ODR issue in viewcompiler" am:
b9879d00c4 am:
d1e12a6112
am:
bf200e78a8
Change-Id: Ib8afbe33ef39a140e8d9855a13aa1296a6b5bd61
Colin Cross [Thu, 21 Mar 2019 08:33:12 +0000 (01:33 -0700)]
Merge "Fix ODR issue in viewcompiler" am:
b9879d00c4
am:
d1e12a6112
Change-Id: If323e9e1a097055d359e1cba146f31449f640253
Minche Li [Thu, 21 Mar 2019 08:25:39 +0000 (08:25 +0000)]
Merge "Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable"
Colin Cross [Thu, 21 Mar 2019 08:23:40 +0000 (01:23 -0700)]
Merge "Fix ODR issue in viewcompiler"
am:
b9879d00c4
Change-Id: I2fda6bdf7ebc082a732d75d55694d47f5a755fdc
Treehugger Robot [Thu, 21 Mar 2019 08:06:00 +0000 (08:06 +0000)]
Merge "Fix ODR issue in viewcompiler"
Michele Berionne [Thu, 21 Mar 2019 08:01:43 +0000 (08:01 +0000)]
Merge "Modified MultiSim APIs"
Mark Chien [Thu, 21 Mar 2019 07:39:25 +0000 (00:39 -0700)]
Merge "Restrict scope of switch Repair Mode" am:
21caf8d65e am:
71b38a20ef
am:
957f27a0c0
Change-Id: Iec6e6ad38e6b960e56c2c0cc389519710f8b7cd7
Mark Chien [Thu, 21 Mar 2019 07:29:01 +0000 (00:29 -0700)]
Merge "Restrict scope of switch Repair Mode" am:
21caf8d65e
am:
71b38a20ef
Change-Id: If23aeef3979ba1ea523a5f86b366f433c616c94f
Mark Chien [Thu, 21 Mar 2019 07:18:11 +0000 (00:18 -0700)]
Merge "Restrict scope of switch Repair Mode"
am:
21caf8d65e
Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148
paulhu [Fri, 15 Mar 2019 09:17:02 +0000 (17:17 +0800)]
Fix Automated API Review issues.
These API's argument/return value must be marked either @NonNull
or @Nullable.
Bug:
126701148
Bug:
126699090
Bug:
126701058
Bug:
126700772
Bug:
126699941
Bug:
126701299
Bug:
126700007
Bug:
126700900
Test: atest FrameworksNetTests
Change-Id: Id030a9f1116178b96aa3d4614b10969a537b2fc4
Mark Chien [Thu, 21 Mar 2019 07:02:14 +0000 (07:02 +0000)]
Merge "Restrict scope of switch Repair Mode"
TreeHugger Robot [Thu, 21 Mar 2019 06:52:50 +0000 (06:52 +0000)]
Merge "Resolves null pointer error in AttentionManagerService"
Luke Huang [Thu, 21 Mar 2019 06:40:30 +0000 (23:40 -0700)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am:
3af01e2f46 am:
e374524144
am:
e800f7719f
Change-Id: Ib6730d87eeebcd82964feeb96d12c09ae652d0d5
Luke Huang [Thu, 21 Mar 2019 06:28:53 +0000 (23:28 -0700)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am:
3af01e2f46
am:
e374524144
Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d
Luke Huang [Thu, 21 Mar 2019 06:18:25 +0000 (23:18 -0700)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
am:
3af01e2f46
Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
Luke Huang [Thu, 21 Mar 2019 06:01:25 +0000 (06:01 +0000)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
TreeHugger Robot [Thu, 21 Mar 2019 05:57:31 +0000 (05:57 +0000)]
Merge "Fixed animation for legacy devices and when not always on"
Kevin Rocard [Mon, 18 Mar 2019 17:47:48 +0000 (10:47 -0700)]
Add getter to AudioPlaybackCaptureConfiguration
As requested by the API concil.
Test: atest android.media.cts.AudioPlaybackCaptureTest
Bug:
128454287
Change-Id: I205fe03d1d23d67ecf3e4590b62bde24f56e4e83
Signed-off-by: Kevin Rocard <krocard@google.com>
Kevin Rocard [Tue, 19 Mar 2019 09:52:22 +0000 (02:52 -0700)]
AudioMix: Do not compare rules of different types
That would lead to NullPointerException as some fields of
AudioMixMatchCriterion are null in some type but not others.
When first registering a UID rule, the register criterion had a null
mAttr. If a USAGE criterion was then added, it would be compared to the
exsting rule as if it was an USAGE rule. As mAttr was null, a
NullPointerException was thrown.
Test: first register a UID rule, then a USAGE rule.
Test: atest android.media.cts.AudioPlaybackCaptureTest#testCaptureMediaUsage
Bug:
111453086
Change-Id: Iece913b87a627171c0a1f872aa57c5125d0ba782
Signed-off-by: Kevin Rocard <krocard@google.com>
TreeHugger Robot [Thu, 21 Mar 2019 05:48:40 +0000 (05:48 +0000)]
Merge "Improve Audio Playback Capture API"
Matt Pape [Thu, 21 Mar 2019 05:28:16 +0000 (05:28 +0000)]
Merge "Remove DeviceConfig.Telephony interface from System API."
Tracy Zhou [Thu, 21 Mar 2019 05:27:40 +0000 (05:27 +0000)]
Merge "Moving fail safe animation cancel to power key-up case."
Tracy Zhou [Thu, 21 Mar 2019 05:27:40 +0000 (05:27 +0000)]
Merge "Better support for cleaning up the recents animation"
TreeHugger Robot [Thu, 21 Mar 2019 05:10:58 +0000 (05:10 +0000)]
Merge "Log the requested display policy."
Colin Cross [Thu, 21 Mar 2019 04:13:33 +0000 (21:13 -0700)]
Fix ODR issue in viewcompiler
libz is already linked as a static library through
libdexfile_static_defaults, don't also link it as a shared library.
Fixes:
=================================================================
==43189==ERROR: AddressSanitizer: odr-violation (0x55d1ed723a60):
[1] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
[2] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
These globals were registered at these points:
[1]:
#0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
#1 0x55d1ed991b1b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0x31bb1b)
[2]:
#0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
#1 0x7f5dff20a09b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/../lib64/libz-host.so+0x3e09b)
Test: m SANITIZE_HOST=address viewcompiler && viewcompiler
Change-Id: I4ebdf7ef4ec1641488fbc25275dbf6aa0cdbe2eb
Lucas Lin [Thu, 21 Mar 2019 04:15:34 +0000 (21:15 -0700)]
Merge "Improve partial connectivity" am:
f6cbc2d533 am:
270e77d930
am:
728a68eefc
Change-Id: I25f9d056c26bf947c2e09516da51b627c3da9685
Nadav Bar [Thu, 21 Mar 2019 04:10:15 +0000 (04:10 +0000)]
Merge "Add ODI_CAPTIONS_OPTED_OUT to secure settings."
Dongwon Kang [Thu, 21 Mar 2019 03:19:58 +0000 (20:19 -0700)]
Consolidate builder classes for DataSourceDesc
Test: MediaPlayer2Test MediaPlayer2DrmTest
Bug:
128461237
Change-Id: I86a3d43c2ceccf97b64018156aacba6c8b744203
TreeHugger Robot [Thu, 21 Mar 2019 04:06:28 +0000 (04:06 +0000)]
Merge "Fix InsetsSourceConsumerTest.testRestore()"
danielle cohen [Wed, 20 Mar 2019 14:46:43 +0000 (16:46 +0200)]
Add ODI_CAPTIONS_OPTED_OUT to secure settings.
Test: none
Bug:
128978908
Change-Id: I3d49ea4e071ace0e457f29fc1a19ef0a279e51f9
Lucas Lin [Thu, 21 Mar 2019 03:56:16 +0000 (20:56 -0700)]
Merge "Improve partial connectivity" am:
f6cbc2d533
am:
270e77d930
Change-Id: Ie68acfe6e2182588cdd8b70d67651241573b2189
Lucas Dupin [Thu, 21 Mar 2019 03:53:10 +0000 (03:53 +0000)]
Merge "Wake up to lock screen when bouncer is visible"
Lucas Dupin [Thu, 21 Mar 2019 03:52:33 +0000 (03:52 +0000)]
Merge "Make the scrim black when waking-up"
Lucas Lin [Thu, 21 Mar 2019 03:45:42 +0000 (20:45 -0700)]
Merge "Improve partial connectivity"
am:
f6cbc2d533
Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
Dongwon Kang [Thu, 21 Mar 2019 03:37:05 +0000 (03:37 +0000)]
Merge "Address feedback on MediaTimestamp, SubtitleData and TimeMetadata"
Lucas Lin [Thu, 21 Mar 2019 03:34:30 +0000 (03:34 +0000)]
Merge "Improve partial connectivity"
mincheli [Wed, 20 Mar 2019 04:23:05 +0000 (12:23 +0800)]
Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable
Just add a null check to reduce NullPointerException happening.
Bug:
110361782
Test: Test: a11y CTS & unit test
Change-Id: Ia4e39c5b3af4943fba2f9ad545b96d5983ee780d
Mady Mellor [Tue, 19 Mar 2019 22:29:05 +0000 (15:29 -0700)]
Documentation & refinements around BubbleMetadata#setIcon API
Also actually use the icon if we're provided it!
Test: atest NotificationTest
Bug:
128010752
Change-Id: Ide8bcf9af4ed687501afffeca4e9ccf84482042b
TreeHugger Robot [Thu, 21 Mar 2019 03:09:27 +0000 (03:09 +0000)]
Merge "Revert "Write touch classification metrics.""
Jiuyu Sun [Thu, 21 Mar 2019 03:06:15 +0000 (03:06 +0000)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult."
Patrick Huang [Thu, 21 Mar 2019 03:02:51 +0000 (20:02 -0700)]
[automerger skipped] Merge "Document type of euicc privileged action extras." am:
4bcdd78d56 am:
cc40f6a046
am:
c858e75f8d -s ours
am skip reason: change_id Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a with SHA1
4db3a997b6 is in history
Change-Id: I6dfa14e8221d8a24e3244c904c36f92f00a0f580
TreeHugger Robot [Thu, 21 Mar 2019 02:57:26 +0000 (02:57 +0000)]
Merge "Revert "Revert "Enable mainline module feature."""
Lajos Molnar [Thu, 21 Mar 2019 02:51:48 +0000 (02:51 +0000)]
Merge "media: refine MediaCodecInfo video PerformancePoints"
Lucas Lin [Thu, 21 Mar 2019 02:34:03 +0000 (02:34 +0000)]
Merge "Modify SettingsLib for partial connectivity"
Patrick Huang [Thu, 21 Mar 2019 02:33:08 +0000 (19:33 -0700)]
Merge "Document type of euicc privileged action extras." am:
4bcdd78d56
am:
cc40f6a046
Change-Id: I95e4dfa1a21d7acdbd3cabc5ef6a438e2941e036
Lajos Molnar [Thu, 21 Mar 2019 02:28:59 +0000 (02:28 +0000)]
Merge "media: break out subprofiles for AV1"
Patrick Huang [Thu, 21 Mar 2019 02:22:35 +0000 (19:22 -0700)]
Merge "Document type of euicc privileged action extras."
am:
4bcdd78d56
Change-Id: I7a3c7f596e8b17aa4c16663bbd652229c5315353
TreeHugger Robot [Thu, 21 Mar 2019 02:16:10 +0000 (02:16 +0000)]
Merge "Aligning job readiness checks."