OSDN Git Service
Bill Yi [Wed, 17 Apr 2019 15:42:37 +0000 (08:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie2573d7c619abe8021a03af40368792ce1ffe9ab
TreeHugger Robot [Wed, 17 Apr 2019 01:34:45 +0000 (01:34 +0000)]
Merge "[WifiEnterpriseConfig] Update javadoc for setDomainSuffixMatch" into qt-dev
Wei Sheng Shih [Wed, 17 Apr 2019 01:04:17 +0000 (01:04 +0000)]
Merge "Fix pinned stack destination been overwrite by obsolete animator." into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 00:22:04 +0000 (00:22 +0000)]
Merge "AudioPolicy: more TestApi for ... testing" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 23:05:44 +0000 (23:05 +0000)]
Merge "Add DND whitelist" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 22:38:03 +0000 (22:38 +0000)]
Merge "Guard remote volume controllers with a lock" into qt-dev
Xiangyu/Malcolm Chen [Tue, 16 Apr 2019 22:31:20 +0000 (22:31 +0000)]
Merge "If data switched to grouped CBRS subscription, show its provider name." into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 22:30:23 +0000 (22:30 +0000)]
Merge "Don't use Drawable's `level`, use our own" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 22:06:24 +0000 (22:06 +0000)]
Merge "Check value in dump before printing" into qt-dev
Hai Shalom [Tue, 16 Apr 2019 22:04:01 +0000 (15:04 -0700)]
[WifiEnterpriseConfig] Update javadoc for setDomainSuffixMatch
wpa_supplicant accepts a semicolon delimited list of domain suffixes.
Update the javadoc to reflect this.
Bug:
130664269
Test: No code changes
Change-Id: I93dbabeddb8854112b413dbb27d094d9d187a73c
TreeHugger Robot [Tue, 16 Apr 2019 21:53:27 +0000 (21:53 +0000)]
Merge "Sharesheet - Merge EXTRA_INITIAL_INTENTS + Ranked apps" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:52:56 +0000 (21:52 +0000)]
Merge "Grant access to device identifiers with READ_DEVICE_IDENTIFIERS appop" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:46:33 +0000 (21:46 +0000)]
Merge "Don't hold mPackages calling addPreferredActivityInternal" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:40:33 +0000 (21:40 +0000)]
Merge "Fix "No Service" in QS when Airplane Mode" into qt-dev
Jeff Sharkey [Tue, 16 Apr 2019 21:34:27 +0000 (21:34 +0000)]
Merge "Handle any exception when allowing failures." into qt-dev
Jeff Sharkey [Tue, 16 Apr 2019 21:34:07 +0000 (21:34 +0000)]
Merge "Instant apps should have default view of storage?" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:20:23 +0000 (21:20 +0000)]
Merge "Update Stretch Analog clock face" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:19:33 +0000 (21:19 +0000)]
Merge "Recovers on boot when scan of data app fails" into qt-dev
Andrii Kulian [Tue, 16 Apr 2019 21:18:18 +0000 (21:18 +0000)]
Merge "Add unit tests for activity client state changes" into qt-dev
Andrii Kulian [Tue, 16 Apr 2019 21:18:18 +0000 (21:18 +0000)]
Merge "Fix extra onStop when finishing after onCreate" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 21:13:44 +0000 (21:13 +0000)]
Merge "Added example for ContentCaptureService.SERVICE_META_DATA" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 20:52:34 +0000 (20:52 +0000)]
Merge "Fixes incorrect app id cleanup on failure" into qt-dev
Yi Jiang [Tue, 16 Apr 2019 20:38:28 +0000 (20:38 +0000)]
Merge "Adds unit tests in attention manager service for two interfaces: -checkAttention() -cancelAttentionCheck()" into qt-dev
Chalard Jean [Tue, 16 Apr 2019 20:30:07 +0000 (20:30 +0000)]
Merge "Move TrafficStats tags for the network stack constants" into qt-dev
Mark Renouf [Tue, 16 Apr 2019 20:21:50 +0000 (20:21 +0000)]
Merge "BubbleData [6/n]: Splice BubbleData into code path" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 19:53:39 +0000 (19:53 +0000)]
Merge "Remove MiniThumbFile" into qt-dev
Jeff Sharkey [Tue, 16 Apr 2019 19:42:26 +0000 (13:42 -0600)]
Instant apps should have default view of storage?
Bug:
130604204,
128633081
Test: none
Change-Id: I0bcd250893527b8e78d1b2f28c3749e96bb3f4ba
Jeff Sharkey [Tue, 16 Apr 2019 19:34:38 +0000 (13:34 -0600)]
Handle any exception when allowing failures.
Bug:
113518608
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I2f67b8016e6057cfd022899bbfba32c3db3a12aa
Felipe Leme [Tue, 16 Apr 2019 19:34:37 +0000 (19:34 +0000)]
Merge "Clarified format of ContentCaptureCondition.FLAG_IS_REGEX" into qt-dev
Fabian Kozynski [Fri, 12 Apr 2019 16:20:13 +0000 (12:20 -0400)]
Fix "No Service" in QS when Airplane Mode
QSCarrierGroup now accounts for the device being on airplane mode when
deciding what to display. In particular, in QS, it marks the view as
GONE.
Test: visual, in phone with DSDS
Test: atest CarrierTextControllerTest
Fixes:
129839626
Change-Id: I54d03f6a00e6e9604fc646b8993a04429881552a
TreeHugger Robot [Tue, 16 Apr 2019 19:19:37 +0000 (19:19 +0000)]
Merge "Grant clipboard access to the Augmented Autofill service." into qt-dev
Matt Pietal [Tue, 16 Apr 2019 16:53:28 +0000 (12:53 -0400)]
Sharesheet - Merge EXTRA_INITIAL_INTENTS + Ranked apps
Organize app-supplied EXTRA_INITIAL_INTENTS plus the highest ranked
apps into a single row (4 in portrait, 8 landscape)
Bug:
130429746
Test: Visual inspection
Change-Id: Icd0755d25b2801b42ea2c3a8c984e9e1f0c7987e
Jean-Michel Trivi [Tue, 16 Apr 2019 19:08:26 +0000 (12:08 -0700)]
AudioPolicy: more TestApi for ... testing
Add uid- device affinity APIs in test API.
Bug:
129708340
Test: atest AudioPolicyTest
Change-Id: Iba1eb996758e366994e610617a63254b774bcb17
Robert Snoeberger [Fri, 12 Apr 2019 17:46:16 +0000 (13:46 -0400)]
Update Stretch Analog clock face
This is part of the response to burn in testing.
Bug:
130422138
Test: mp sysuig and checked clock in picker app
Change-Id: I68971f8d132618f4d388160aeabb0fd3aa024b9d
Ryan Mitchell [Mon, 15 Apr 2019 23:47:58 +0000 (16:47 -0700)]
Check value in dump before printing
For applications that remove the names of resources from the string
pool, check that the attribute has a name before attempting to print it.
Test: manual
Bug:
130553900
Change-Id: I05e5d59f01b2c02c8a024d06fd896074d6bf465b
TreeHugger Robot [Tue, 16 Apr 2019 18:53:16 +0000 (18:53 +0000)]
Merge "Move music icon to secondary row" into qt-dev
Maggie White [Tue, 16 Apr 2019 18:17:33 +0000 (18:17 +0000)]
Merge "thermal: Add pulled cooling device atom and a field to Temperature atom" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 18:16:54 +0000 (18:16 +0000)]
Merge "Add custom title for settings dialogs" into qt-dev
Mark Renouf [Mon, 8 Apr 2019 19:02:54 +0000 (15:02 -0400)]
BubbleData [6/n]: Splice BubbleData into code path
BubbleData internal representation becomes a list in prep
for managing order and grouping internally. Changes are
passed through bubbleData and dispatched for UI updates
via Listener.
Bug:
123542488
Test: atest BubbleControllerTest
Change-Id: I380ca718bc896307b31e73030b4202762a6cf353
TreeHugger Robot [Tue, 16 Apr 2019 18:07:55 +0000 (18:07 +0000)]
Merge ""Charging this device via USB" notification isn't relevant for automotive." into qt-dev
Fan Zhang [Tue, 16 Apr 2019 18:07:50 +0000 (18:07 +0000)]
Merge "Avoid NPE when accessing to EnforcedAdmin" into qt-dev
Mehdi Alizadeh [Tue, 16 Apr 2019 18:01:33 +0000 (18:01 +0000)]
Merge "Check before closing the CloseGuard if not closed yet" into qt-dev
Winson Chiu [Tue, 16 Apr 2019 17:53:54 +0000 (17:53 +0000)]
Merge "Skip idmap1 generation if target defines overlayable" into qt-dev
Julia Reynolds [Tue, 16 Apr 2019 16:50:04 +0000 (12:50 -0400)]
Add DND whitelist
That is, a whitelist of packages that can make sound on the ringer
stream in the background when DND is in priority only mode
Test: atest
Fixes:
130359054
Change-Id: I0e3a18bd6c3b1c096e7ce94b2c692eb7aa66ae76
Yi Jiang [Wed, 10 Apr 2019 20:36:27 +0000 (13:36 -0700)]
Adds unit tests in attention manager service for two interfaces:
-checkAttention()
-cancelAttentionCheck()
Bug:
128918890
Test: atest AttentionManagerServiceTest
Change-Id: I0ca0029526e6254881d546728e64d53a04e60b93
Brad Ebinger [Tue, 16 Apr 2019 17:36:05 +0000 (17:36 +0000)]
Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" into qt-dev
Patrick Baumann [Tue, 16 Apr 2019 17:22:48 +0000 (10:22 -0700)]
Recovers on boot when scan of data app fails
Prior to this change, system apps that had updated versions installed
that could not be scanned on boot, did not have a fallback mechanism to
restore the system app. With this change, we prepare for such a scenario
and restore the system app using the existing "expecting better"
mechanism.
Test: manual; muck with an APK in /data/app and reboot.
Bug:
117471712
Change-Id: Ic50880cc04e92003c2a20869cf38835af7ce3ccb
TreeHugger Robot [Tue, 16 Apr 2019 17:14:43 +0000 (17:14 +0000)]
Merge "Drop final remnants of Type clock face" into qt-dev
Robert Snoeberger [Thu, 11 Apr 2019 16:57:33 +0000 (12:57 -0400)]
Drop final remnants of Type clock face
Bug:
130296587
Test: mp sysuig
Change-Id: I1a78beadedb2b0afba34620273f5cb80d7bd2291
TreeHugger Robot [Tue, 16 Apr 2019 17:05:03 +0000 (17:05 +0000)]
Merge "Sharesheet - Prevent duplicate direct share targets" into qt-dev
Todd Kennedy [Tue, 16 Apr 2019 16:58:35 +0000 (09:58 -0700)]
Don't hold mPackages calling addPreferredActivityInternal
Fixes:
130635790
Test: manual
Change-Id: I1b8246b73a65c819ce22fe447e88e9116d9c5fbf
TreeHugger Robot [Tue, 16 Apr 2019 16:58:24 +0000 (16:58 +0000)]
Merge "Don't allow PI-based starts and trampolines when sender is SYSTEM_UID and it happens to pass foregroundness check at the time of sending" into qt-dev
Lucas Dupin [Thu, 11 Apr 2019 17:59:13 +0000 (10:59 -0700)]
Move music icon to secondary row
Bug:
130223602
Test: visual
Change-Id: I5c2f5acc267f5fa87b1f997afd3c304e5a2bf184
Salvador Martinez [Fri, 12 Apr 2019 22:55:37 +0000 (15:55 -0700)]
Add custom title for settings dialogs
This is a generic version of the custom title that will
be used in settings dialogs soon. Adding it to settings
lib since others will need to make use of it as well.
Test: robotests pass
Bug:
130251804
Change-Id: I48f8e24a2b2a117e5a8054c5bc0b240ba68fe1ad
TreeHugger Robot [Tue, 16 Apr 2019 16:41:03 +0000 (16:41 +0000)]
Merge "Add more documentation for ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS." into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 16:40:53 +0000 (16:40 +0000)]
Merge "Only reset layout seq when moved to a new display." into qt-dev
Fabian Kozynski [Tue, 16 Apr 2019 16:15:26 +0000 (16:15 +0000)]
Merge "Change the label color to textColorSecondary" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 16:15:24 +0000 (16:15 +0000)]
Merge "Sharesheet - Add copy text in response to UXR" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 16:01:13 +0000 (16:01 +0000)]
Merge "New activity transitions" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 15:49:33 +0000 (15:49 +0000)]
Merge "Fix VR-related system APIs" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 15:44:24 +0000 (15:44 +0000)]
Merge "Copy rects such that we don't modify state" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 15:35:22 +0000 (15:35 +0000)]
Merge "Revert "Revert "Fix issue in attached layouting""" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 15:28:22 +0000 (15:28 +0000)]
Merge "make onGetSupportedVoiceActions return @NonNull and return empty set by default" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 15:13:33 +0000 (15:13 +0000)]
Merge "Always send Adjustment for importance" into qt-dev
Michal Karpinski [Tue, 16 Apr 2019 13:02:46 +0000 (14:02 +0100)]
Don't allow PI-based starts and trampolines when sender
is SYSTEM_UID and it happens to pass foregroundness check
at the time of sending
It could lead to abuses like directing the user to Settings app
and then giving a PI through any API, so that app could open
activity/trampoline due to Settings app (SYSTEM_UID) being fg.
PI-based starts where sender is SYSTEM_UID will no longer be
supported based on foregroundness check. Any such starts need
to now be explicitly whitelisted (see b/
124858756).
Also, ignore windows of type TYPE_APPLICATION_STARTING in
isAnyNonToastWindowVisibleForUid() check.
Bug:
129563343
Test: atest WmTests:ActivityStarterTests
Test: atest BackgroundActivityLaunchTest
Test: atest CtsActivityManagerDeviceTestCases:ActivityStarterTests
Test: atest WmTests:RootWindowContainerTests
Change-Id: I563f71f0b1c7922d8c675d2e4feed909f43446be
TreeHugger Robot [Tue, 16 Apr 2019 14:45:23 +0000 (14:45 +0000)]
Merge "Fix crash when clearing package preferred activities." into qt-dev
Tyler Gunn [Tue, 16 Apr 2019 14:16:33 +0000 (14:16 +0000)]
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS." into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 14:14:29 +0000 (14:14 +0000)]
Merge "Ensure all fields of AutoBufferPointer are initialized" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 13:48:20 +0000 (13:48 +0000)]
Merge changes from topic "viewRootImplTest failure" into qt-dev
* changes:
Introduce InsetsModeSession to InsetsAnimationControlImplTest
Move no longer flaky tests into pre-submit
Jorim Jaggi [Tue, 16 Apr 2019 13:38:49 +0000 (15:38 +0200)]
Copy rects such that we don't modify state
Test: PopupWindowTest
Bug:
130553898
Bug:
130231322
Change-Id: I8abe25d054b34f1bf1234e1328b32aefc2020cf6
Jorim Jaggi [Tue, 16 Apr 2019 12:57:56 +0000 (14:57 +0200)]
Revert "Revert "Fix issue in attached layouting""
This reverts commit
9acce426520e639fd91eef8b62651803a98a7273.
Underlying issue fixed in follow up CL.
Test: PopupWindowTest
Bug:
130231322
Bug:
130553898
Change-Id: I5e332394868eb26ef44ce155bc41eb4405d0093a
Hai Zhang [Tue, 16 Apr 2019 12:54:49 +0000 (20:54 +0800)]
Fix crash when clearing package preferred activities.
Use put() instead of setValueAt().
Bug:
130468857
Test: presubmit
Change-Id: If155c2a4ae9d4f953703b653eef2c04b2b516953
Matt Pietal [Mon, 15 Apr 2019 15:38:39 +0000 (11:38 -0400)]
Sharesheet - Add copy text in response to UXR
Add copy text underneath image to make it clear what the button
means. Make text clickable. Align text colors with spec.
Bug:
130350131
Test: Manual inspection
Change-Id: Ia2916fd48ef8b2d1862d9baf5f9f695f54187d55
Leon Scroggins [Tue, 16 Apr 2019 12:15:16 +0000 (12:15 +0000)]
Merge "Do not cache AVDs that are off screen" into qt-dev
Charles Chen [Tue, 16 Apr 2019 09:39:23 +0000 (17:39 +0800)]
Introduce InsetsModeSession to InsetsAnimationControlImplTest
InsetsAnimationControlImplTest sets new insets mode to full mode when setUp(), which
leads some tests in ViewRootImplTest fail. Introduce InsetsModeSession
to fix it.
Change-Id: Id159db1395d1b105d9d4d3d13cdba778015e9989
Fix:
130609028
Test: atest ViewRootImplTest InsetsAnimationControlImplTest
Charles Chen [Mon, 15 Apr 2019 10:43:35 +0000 (18:43 +0800)]
Move no longer flaky tests into pre-submit
Bug:
123654474
Test: test metrics and wm-tests
Change-Id: I299a471be08c465823e1c18d04f3399797ba5a60
TreeHugger Robot [Tue, 16 Apr 2019 11:20:45 +0000 (11:20 +0000)]
Merge "ActivityThread: Preserve windows when relaunching all activities" into qt-dev
Orion Hodson [Mon, 15 Apr 2019 15:14:51 +0000 (16:14 +0100)]
Ensure all fields of AutoBufferPointer are initialized
In the process of revising libnativehelper interface, the
initialization of the fArray field was dropped. This change fixes
this and adds regression tests.
In writing the tests, it became apparent that the AutoBufferPointer
destructor would crash if the underlying buffer was heap array backed
and the buffer position was non-zero. ReleasePrimitiveArrayCritical
was called with the element corresponding to the current position
rather than the first element.
Bug: b/
130390512
Test: atest FrameworksCoreTests:android.graphics.BitmapTest
(cherry picked from commit
e522c99430ec9ee0b4daa588dbcaea4824bc3f70)
Merged-In: I319512aaede7ba8af5d013c9281417695abf9099
Change-Id: I319512aaede7ba8af5d013c9281417695abf9099
TreeHugger Robot [Tue, 16 Apr 2019 09:38:25 +0000 (09:38 +0000)]
Merge "If the calling process isn't whitelisted for background activity start, check the other processes of calling UID too" into qt-dev
Tarandeep Singh [Tue, 16 Apr 2019 07:37:06 +0000 (07:37 +0000)]
Merge "Allow MSIME to set inactive when window loses focus." into qt-dev
Jin Seok Park [Tue, 16 Apr 2019 06:47:18 +0000 (06:47 +0000)]
Merge "Rename Session2Command methods" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 06:37:50 +0000 (06:37 +0000)]
Merge "Defer top process state for VM" into qt-dev
wilsonshih [Wed, 3 Apr 2019 07:55:02 +0000 (15:55 +0800)]
Fix pinned stack destination been overwrite by obsolete animator.
There is a race condition when an app leave from landscape mode and enter
pinned stack in portrait mode. First racer is that TaskStack will post
animateBounds to animation thread, the second is #onConfigurationChanged
will ask TaskStack to update new stack bounds if needed.
When the first animation executed, it will call TaskStack#onAnimationEnd
then #setPinnedStackSize, however, this bounds may already obsoleted if
configuration changed happen after first animation is posted.
To fix this issue, we can cancel the existing animator via verifying the
final destination, and prevent animator set obsoleted bounds back if the
animation is canceled.
Fix:
129723312
Test: Try reproduce this issue over 100+ times.
Test: atest ActivityManagerPinnedStackTests
Test: atest BoundsAnimationControllerTests
Change-Id: I5d42cbe576e7683b22679b1e97be07063c2a05d6
Sean Stout [Tue, 16 Apr 2019 05:50:30 +0000 (05:50 +0000)]
Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev
Hai Zhang [Tue, 16 Apr 2019 05:16:16 +0000 (13:16 +0800)]
Add more documentation for ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS.
Bug:
130351486
Test: build
Change-Id: If15aa04a3a3ebe717718ae99157e845acbccf6ae
Sungsoo Lim [Tue, 16 Apr 2019 04:49:08 +0000 (13:49 +0900)]
Guard remote volume controllers with a lock
Bug:
130325194
Test: build
Change-Id: Idd7a280cf3ecc4068e99bedba8d3c40a0e805916
Kevin Chyn [Tue, 16 Apr 2019 04:43:32 +0000 (04:43 +0000)]
Merge "Cache and log enrollment settings" into qt-dev
Jin Seok Park [Tue, 16 Apr 2019 01:35:14 +0000 (10:35 +0900)]
Rename Session2Command methods
Bug:
130580655
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandTest
Change-Id: I89509ddc1b10d47a01f7227ae60c5529718d39de
jiayuzhou [Mon, 15 Apr 2019 20:36:06 +0000 (13:36 -0700)]
make onGetSupportedVoiceActions return @NonNull and return empty set by default
Test: make
Fix:
124302147
Change-Id: Ie91184310a1709cd62cd7d89911beda5c4e2d513
Jeff Sharkey [Tue, 16 Apr 2019 03:26:18 +0000 (03:26 +0000)]
Merge "Allow failures of applyBatch() operations." into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 03:14:29 +0000 (03:14 +0000)]
Merge "Remove MediaItem2" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 02:50:09 +0000 (02:50 +0000)]
Merge "Don't cancel injected event when mouse event arrives" into qt-dev
NT Tsai [Tue, 16 Apr 2019 02:27:02 +0000 (02:27 +0000)]
Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev
Winson Chung [Tue, 16 Apr 2019 02:13:58 +0000 (02:13 +0000)]
Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 01:41:41 +0000 (01:41 +0000)]
Merge "Log for pending activities launch" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 01:20:05 +0000 (01:20 +0000)]
Merge "Ui should be UI in the javadoc" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 01:11:23 +0000 (01:11 +0000)]
Merge "Restore navbar transparency state on config change" into qt-dev
Hall Liu [Tue, 16 Apr 2019 01:01:59 +0000 (01:01 +0000)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev
Jeff Sharkey [Tue, 16 Apr 2019 00:54:58 +0000 (18:54 -0600)]
Allow failures of applyBatch() operations.
In some cases, the supplier of ContentProviderOperation is okay
if certain operations fail, and they'd like ContentProviderResult
to tell them about the failures instead of aborting the remainder
of the transaction.
Start using this for ModernMediaScanner, where we probably raced
with someone when building an UPSERT-style operation. We'll
pick up any changes to those files during the next scan.
Bug:
128494336
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ida8230ff2bbb3bab56eb83928e49e7097bfbc9fd
Mehdi Alizadeh [Tue, 16 Apr 2019 00:25:46 +0000 (17:25 -0700)]
Check before closing the CloseGuard if not closed yet
Bug:
130435945
Test: atest AppPredictionServiceTest
Change-Id: I19d866d54e6b7e74e0399e2910ab9c9c71d13f51