Ryan Mitchell 597cb08904 Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b am: 13405917a6 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c9be5b9bd85ea9a54b06b1b39a8d89e8d96206c

2021-01-07 19:21:04 +00:00

..

integrity

Apply fixes for EfficientStringsChecker.

2020-10-20 22:00:16 -06:00

om

Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b am: 13405917a6

2021-01-07 19:21:04 +00:00

pm

Merge "update owners for shortcut and launcher related files" am: 6173852165 am: 8d21688681 am: 82d5729a4b

2021-01-07 17:53:22 +00:00

res

Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db am: 37c7d893b1

2021-01-07 11:12:18 +00:00

rollback

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

ApexEnvironment.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

AutofillOptions.aidl

…

AutofillOptions.java

Update language to comply with Android's inclusive language guidance

2020-09-14 09:59:01 -06:00

BroadcastReceiver.java

…

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

Update ClipData.toString and related code to not leak common forms of PII

2020-10-27 16:31:19 -07:00

ClipDescription.aidl

…

ClipDescription.java

5/ Validate and resolve shortcut & task activity infos

2020-11-03 15:52:37 -08:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ContentCaptureOptions.aidl

…

ContentCaptureOptions.java

Update language to comply with Android's inclusive language guidance

2020-09-14 09:59:01 -06:00

ContentInsertHandler.java

…

ContentInterface.java

…

ContentProvider.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ContentProviderClient.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

ContentProviderNative.java

Add async version of "uncanonicalize"

2020-10-28 17:27:27 -07:00

ContentProviderOperation.java

Apply fixes for EfficientStrings.

2020-10-20 22:00:18 -06:00

ContentProviderResult.java

Apply fixes for EfficientStrings.

2020-10-20 22:00:18 -06:00

ContentQueryMap.java

…

ContentResolver.java

Remove dead isolated storage code from StorageManagerService

2020-11-27 09:45:50 +00:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

Context.java

Add a UI Context for RootTaskDisplayAreaOrganizer

2021-01-07 17:09:32 +08:00

ContextWrapper.java

Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b am: 4b46fb6b09 am: f1f8f956c6

2021-01-07 12:26:58 +00:00

CursorEntityIterator.java

…

CursorLoader.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IContentService.aidl

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

[pm/incremental] disable unstartable state and hide related APIs

2020-11-04 15:36:27 +00:00

IntentFilter.aidl

…

IntentFilter.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IntentSender.aidl

…

IntentSender.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ISyncAdapterUnsyncableAccountCallback.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

…

LocusId.aidl

…

LocusId.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

LoggingContentInterface.java

…

MimeTypeFilter.java

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

OWNERS

Add more OWNERS coverages

2020-12-11 19:16:38 +08:00

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

PermissionChecker.java

Improve the documentation of the paramters passed to noteOp

2020-10-08 17:48:10 -07:00

QuickViewConstants.java

…

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

RestrictionsManager.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

Mechanical refactoring to new typed XML classes.

2020-11-30 20:45:25 -07:00

SyncAdapterType.aidl

…

SyncAdapterType.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncRequest.aidl

…

SyncRequest.java

…

SyncResult.aidl

…

SyncResult.java

Apply fixes for EfficientStrings.

2020-10-20 22:00:20 -06:00

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

2020-08-31 21:21:38 -07:00

SyncStatusObserver.java

…

TEST_MAPPING

Promote Context related tests to presubmit

2020-11-20 20:11:58 +08:00

UndoManager.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

UndoOperation.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…