Mathew Inwood 6914312812 resolve merge conflicts of daef557352 to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50

2018-03-23 16:35:44 +00:00

..

om

OverlayManager: Add categories

2018-02-13 14:41:38 -08:00

pm

resolve merge conflicts of daef557352 to pi-dev-plus-aosp

2018-03-23 16:35:44 +00:00

res

Merge "Refactor AssetManager"

2018-03-02 22:05:45 +00:00

AbstractThreadedSyncAdapter.java

onUnsyncableAccount: Better docs, main thread

2018-03-15 16:59:50 -07:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

BroadcastReceiver.java

Fix broken javadocs.

2017-08-06 07:37:08 -06:00

ClipboardManager.java

Add explicit method to clear clipboard.

2018-02-26 14:43:11 -07:00

ClipData.aidl

…

ClipData.java

incidentd: dumping jobscheduler to proto

2018-01-09 12:05:39 -08:00

ClipDescription.aidl

…

ClipDescription.java

incidentd: dumping jobscheduler to proto

2018-01-09 12:05:39 -08:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

incidentd: dumping jobscheduler to proto

2018-01-09 12:05:39 -08:00

ContentInsertHandler.java

…

ContentProvider.java

Unhide slice data APIs

2017-10-16 14:38:18 -07:00

ContentProviderClient.java

Allow blocking calls when protected against ANRs.

2017-11-09 18:32:37 -07:00

ContentProviderNative.java

…

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync.

2018-03-21 21:28:43 +00:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH

2018-02-23 23:45:18 +00:00

ContextWrapper.java

Minor autofill changes to support compat mode CTS tests.

2018-02-16 18:01:17 -08:00

CursorEntityIterator.java

…

CursorLoader.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

Add explicit method to clear clipboard.

2018-02-26 14:43:11 -07:00

IContentProvider.java

…

IContentService.aidl

…

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Added ACTION_BATTERY_LEVEL_CHANGED

2018-03-08 10:09:01 -08:00

IntentFilter.aidl

…

IntentFilter.java

Add component ordering

2018-02-28 09:16:07 -08:00

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

Add AbstractThreadedSyncAdapter#onUnsyncableAccount API

2018-01-25 00:37:48 +00:00

ISyncAdapterUnsyncableAccountCallback.aidl

Add AbstractThreadedSyncAdapter#onUnsyncableAccount API

2018-01-25 00:37:48 +00:00

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

PermissionChecker.java

Copy PermissionChecker from support lib and use in RcognitionService

2018-02-23 12:53:55 -08:00

QuickViewConstants.java

New supported QuickViewConstant feature to delete a file.

2017-12-06 12:48:29 -05:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

…

RestrictionsManager.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e

2018-01-09 12:25:22 -08:00

SharedPreferences.java

Doc that SharedPreferences is IO-expensive

2017-11-15 13:31:56 -08:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncRequest.aidl

…

SyncRequest.java

…

SyncResult.aidl

…

SyncResult.java

Fix SyncResutl.delayUntil javadoc

2018-03-15 11:31:55 -07:00

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

…

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…