Neil Fuller e01a7adf5a resolve merge conflicts of 55c0a66825 to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4

2018-06-26 11:55:46 +01:00

..

om

Merge changes from topic "b_78809704" into pi-dev

2018-05-11 17:44:53 +00:00

pm

Merge "Don't override targetVers with minCode"

2018-06-19 13:10:23 -07:00

res

Frameworks: Remove complex boolean

2018-06-12 10:37:04 -07: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

…

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

Split provider / service dumpsys into platform and non-platform

2018-04-17 10:41:40 -07: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

Tweak exemption for sync requests made by FG apps

2018-05-23 14:50:05 -07:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

resolve merge conflicts of 55c0a66825 to stage-aosp-master

2018-06-26 11:55:46 +01:00

ContextWrapper.java

Require READ_CALL_LOG permission to see phone numbers in phone state.

2018-05-18 14:37:43 -07: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

Add 1-day sync stats in syncmanager dumpsys.

2018-04-16 12:23:26 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Merge "Document -n option on intent specification." into pi-dev

2018-06-07 00:36:10 +00: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

Fix javadoc xrefs.

2018-04-03 07:16:21 -04: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

SyncManager: Dump per-source last sync time too.

2018-04-16 17:20:19 -07:00

SyncStatusObserver.java

…

UndoManager.java

…

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…