OSDN Git Service
Kweku Adams [Fri, 22 Mar 2019 18:04:01 +0000 (11:04 -0700)]
Adding strings for user-initiated heap dumps.
This is taken from http://ag/
6795760.
Bug:
77490269
Test: N/A
Change-Id: I8ee281788046a86657decf3d1660d20b4b575bbc
TreeHugger Robot [Thu, 21 Mar 2019 21:13:09 +0000 (21:13 +0000)]
Merge "Remove Session2CommandGroup.Builder methods"
Peiyong Lin [Thu, 21 Mar 2019 20:54:46 +0000 (20:54 +0000)]
Merge "Revert "Allow screenshot to carry more information.""
Peiyong Lin [Thu, 21 Mar 2019 20:53:42 +0000 (20:53 +0000)]
Revert "Allow screenshot to carry more information."
This reverts commit
42d5d0322af0157bf1b1b9306f1f75309108a002.
Below is the original commit message:
Previously screenshot returns a GraphicBuffer without any other information
about how to interpret this buffer, especially color space. We could not take
any WCG screenshot, and the color space information is also lost by the time we
create bitmap from the GraphicBuffer. This patch adds a ScreenshotGraphicBuffer
as a wrapper around GraphicBuffer with more information, for example color
space. And make screenshot native method return ScreenshotGraphicBuffer.
BUG:
116112787
Test: Build, flash and boot. Verify with WCG Photos.
Reason for revert: Break master build
Change-Id: I36efb7a1274bdcd31b6a7f1070a96d522c0f124a
Anil Admal [Thu, 21 Mar 2019 20:36:48 +0000 (20:36 +0000)]
Merge "Revert "Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)"""
Alex Salo [Thu, 21 Mar 2019 20:35:18 +0000 (20:35 +0000)]
Merge "Mark attention component_name with @TestApi"
Daniel Rosenberg [Thu, 21 Mar 2019 20:31:55 +0000 (20:31 +0000)]
Merge "Mount adopted storage after boot completed"
Wale Ogunwale [Thu, 21 Mar 2019 19:56:06 +0000 (19:56 +0000)]
Merge "Add missed lock for startHomeOnDisplay"
Peiyong Lin [Thu, 21 Mar 2019 19:45:19 +0000 (19:45 +0000)]
Merge "Allow screenshot to carry more information."
Michele Berionne [Thu, 21 Mar 2019 19:41:15 +0000 (12:41 -0700)]
[automerger skipped] Merge "Modified MultiSim APIs" am:
c5461c4490 am:
be4d9657a7
am:
296e21451d -s ours
am skip reason: change_id Icbd36f714c577a965d39336d54d7224c8c2c7cd2 with SHA1
6e1c1094d8 is in history
Change-Id: I7ef210ecfc9ec21bf5f4eac51d85e43fc6269809
Michele Berionne [Thu, 21 Mar 2019 19:19:47 +0000 (12:19 -0700)]
Merge "Modified MultiSim APIs" am:
c5461c4490
am:
be4d9657a7
Change-Id: I9aa4e0231b7f546f8e26ba9a77c20f4e4a89dc86
TreeHugger Robot [Thu, 21 Mar 2019 19:18:13 +0000 (19:18 +0000)]
Merge "Corresponding changes for latest libtextclassifier import"
Android Build Merger (Role) [Thu, 21 Mar 2019 19:16:04 +0000 (19:16 +0000)]
Merge "Merge "Require the ANDROID_TZDATA_ROOT env var" am:
f6c4aa1f67 am:
20fd6bdc01 am:
1f36ba9bef"
Neil Fuller [Thu, 21 Mar 2019 19:13:37 +0000 (12:13 -0700)]
Merge "Require the ANDROID_TZDATA_ROOT env var" am:
f6c4aa1f67 am:
20fd6bdc01
am:
1f36ba9bef
Change-Id: I57438a71f9de6d18cc94734437af723c8747f4e3
Andrei-Valentin Onea [Thu, 21 Mar 2019 19:11:51 +0000 (19:11 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Michele Berionne [Thu, 21 Mar 2019 19:07:24 +0000 (12:07 -0700)]
Merge "Modified MultiSim APIs"
am:
c5461c4490
Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
Jordan Liu [Thu, 21 Mar 2019 19:06:37 +0000 (12:06 -0700)]
Merge "Update documentation" am:
ae25b62203 am:
ea992811ff
am:
1cf81ee892
Change-Id: Ica4407926ea618b6c3d1bafdf80d97f2b51d752b
Android Build Merger (Role) [Thu, 21 Mar 2019 18:56:08 +0000 (18:56 +0000)]
Merge "Merge "Fix Automated API Review issues." am:
43c1ade661 am:
9e3f29037b am:
ce18c5a1ec"
Paul Hu [Thu, 21 Mar 2019 18:54:51 +0000 (11:54 -0700)]
Merge "Fix Automated API Review issues." am:
43c1ade661 am:
9e3f29037b
am:
ce18c5a1ec
Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98
Michele Berionne [Thu, 21 Mar 2019 18:53:11 +0000 (18:53 +0000)]
Merge "Modified MultiSim APIs"
Arnaud Berry [Thu, 21 Mar 2019 18:50:11 +0000 (18:50 +0000)]
Merge "Remove androidx.car_car resources from SysUI"
Arnaud Berry [Thu, 21 Mar 2019 18:50:11 +0000 (18:50 +0000)]
Merge "Theme fixit for Car Sys UI"
Jack Yu [Thu, 21 Mar 2019 18:47:47 +0000 (18:47 +0000)]
Merge "IWLAN API review changes"
Anil Admal [Thu, 21 Mar 2019 18:46:58 +0000 (18:46 +0000)]
Revert "Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)""
This reverts commit
2f13c07c50382428519953e1f434c0e18fb8fea3.
Reason for revert: It appears that the build includes ag/
6721678 but not ag/
6762021 even though they both were submitted together. Hence the build errors.
Change-Id: I5342f358ca2fb7a92591608d45920f515db2e20d
TreeHugger Robot [Thu, 21 Mar 2019 18:40:36 +0000 (18:40 +0000)]
Merge "Refactor: handle unparsable longs"
Fabian Kozynski [Thu, 21 Mar 2019 18:37:07 +0000 (18:37 +0000)]
Merge "Fixes focus of TalkBack in QuickStatusBarHeader"
Fabian Kozynski [Thu, 21 Mar 2019 18:36:37 +0000 (18:36 +0000)]
Merge "Added correct TalkBack support for QSCarrier"
Neil Fuller [Thu, 21 Mar 2019 18:23:43 +0000 (11:23 -0700)]
Merge "Require the ANDROID_TZDATA_ROOT env var" am:
f6c4aa1f67
am:
20fd6bdc01
Change-Id: Id3356648249cb0ca9bb520e56e401c8e63327e58
Jordan Liu [Thu, 21 Mar 2019 18:14:33 +0000 (11:14 -0700)]
Merge "Update documentation" am:
ae25b62203
am:
ea992811ff
Change-Id: Ic4d2927b28a1684f2bd926be8c27b2215104d5c6
Ricky Wai [Thu, 21 Mar 2019 18:04:28 +0000 (18:04 +0000)]
Merge "Change PackageManager.getSyntheticAppDetailsActivityEnabled to public api"
Paul Hu [Thu, 21 Mar 2019 18:01:28 +0000 (11:01 -0700)]
Merge "Fix Automated API Review issues." am:
43c1ade661
am:
9e3f29037b
Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090
Neil Fuller [Thu, 21 Mar 2019 17:59:49 +0000 (10:59 -0700)]
Merge "Require the ANDROID_TZDATA_ROOT env var"
am:
f6c4aa1f67
Change-Id: Ic307cf7c3e648f37170834c1b265761de4d77b6b
Jordan Liu [Thu, 21 Mar 2019 17:55:23 +0000 (10:55 -0700)]
Merge "Update documentation"
am:
ae25b62203
Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11
Paul Hu [Thu, 21 Mar 2019 17:46:03 +0000 (10:46 -0700)]
Merge "Fix Automated API Review issues."
am:
43c1ade661
Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
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)""
Neil Fuller [Thu, 21 Mar 2019 17:43:45 +0000 (17:43 +0000)]
Merge "Require the ANDROID_TZDATA_ROOT env var"
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
Jordan Liu [Thu, 21 Mar 2019 17:36:14 +0000 (17:36 +0000)]
Merge "Update documentation"
Nathan Harold [Thu, 21 Mar 2019 17:23:19 +0000 (17:23 +0000)]
Merge "Expose CellInfoTdscdma"
Paul Hu [Thu, 21 Mar 2019 17:19:26 +0000 (17:19 +0000)]
Merge "Fix Automated API Review issues."
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
Andrei Onea [Thu, 21 Mar 2019 13:57:17 +0000 (13:57 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.companion
android.filterfw
android.hardware.camera2.utils
android.inputmethodservice
android.net.nsd
android.os
android.preference
android.security.keymaster
android.service.dreams
android.telecom
android.telephony.ims.compat.feature
android.telephony
android.util
android.view.accessibility
android.media.effect
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: I9c2f8347952f3cc65759472b0e1a2717b285e44e
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
Chilun [Thu, 21 Mar 2019 11:51:37 +0000 (19:51 +0800)]
Add missed lock for startHomeOnDisplay
Missing mGlobalLock while calling to RootActivityContainer.
Bug:
128955176
Bug:
127348870
Test: atest ActivityManagerMultiDisplayTests
Test: atest ActivityManagerActivityVisibilityTests
Test: atest ActivityManagerSplitScreenTests#testMinimizeAndUnminimizeThenGoingHome
Test: atest ActivityMetricsLoggerTests#testAppHotLaunchSetsWaitResultDelayData
Change-Id: I1fefaabc0c5ad2b38be4bd3b02b998cad93cdd20
Mark Chien [Thu, 21 Mar 2019 12:02:54 +0000 (12:02 +0000)]
Merge "Replace TcpSocketInfo with similar structure"
Ricky Wai [Thu, 21 Mar 2019 11:34:46 +0000 (11:34 +0000)]
Change PackageManager.getSyntheticAppDetailsActivityEnabled to public api
Bug:
127713970
Test: Able to compile
Change-Id: Ic927d6f0ba25289103441d32ca8e16db96dbec3d
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"
Rafal Slawik [Thu, 14 Mar 2019 12:39:54 +0000 (12:39 +0000)]
Refactor: handle unparsable longs
Test: atest MemoryStatUtilTest
Change-Id: I4827dac5ffd5488a3795391e09a2db49601234e9
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