Brad Ebinger 36ba58f32b Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41 am: 5bbee4a0bb ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65ab2d2c40512291e34f64e6ac070fbae4d20475

2021-02-04 01:42:57 +00:00

..

integrity

Merge "Add owners" am: 033aefcb06 am: 8098a5fa5d am: 8121f93bac

2021-01-28 20:42:22 +00:00

om

Merge changes I33358ce4,I5746ffae,Ie307ce30,I8cd5eb46,Ie02ddd37, ... am: 0b5e65b81d am: 77ad0e767c am: 514b93a67b

2021-01-21 20:09:12 +00:00

pm

Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41 am: 5bbee4a0bb

2021-02-04 01:42:57 +00:00

res

Implement per-app window resizing override.

2021-01-29 16:20:41 -08: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

Add StrictMode check for unsafe intent launching

2021-01-20 13:05:09 -08: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

Merge "Move GameManager to android.app package." into sc-dev

2021-02-02 19:36:13 +00:00

ContextWrapper.java

Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f178d am: c9e394fc27 am: 796c878352

2021-01-22 03:09:15 +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

Add StrictMode check for unsafe intent launching

2021-01-20 13:05:09 -08:00

IntentFilter.aidl

…

IntentFilter.java

Add support for pathSuffix

2021-01-12 16:15:52 -08: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 new owners for IntentFilter and Intent

2021-01-13 03:55:25 +00: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

…