Nicolas Geoffray 7e1a273708 resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0

2017-05-26 11:03:19 +01:00

..

om

Add OverlayManagerService#setEnableExclusive

2017-03-07 16:01:20 -05:00

pm

resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp

2017-05-26 11:03:19 +01:00

res

Resources: fix race with creating theme

2017-05-23 13:14:54 -07:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

Fix stale data due to stopped loader.

2017-03-08 15:29:27 -08:00

BroadcastReceiver.java

Fix issue #38210653: Few more tweaks of job scheduler

2017-05-12 17:29:04 -07:00

ClipboardManager.java

Replace possibly-expensive size() == 0 with isEmpty()

2017-03-24 15:10:41 -07:00

ClipData.aidl

…

ClipData.java

Change ClipData.addItem signature

2017-04-27 15:29:11 -07:00

ClipDescription.aidl

…

ClipDescription.java

Fix a spelling.

2017-04-21 10:35:47 -07:00

ComponentCallbacks2.java

More auto-doc work.

2017-04-21 16:35:08 -06:00

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

Even more auto-doc work.

2017-04-24 13:20:46 -06:00

ContentInsertHandler.java

…

ContentProvider.java

Address API Council feedback.

2017-04-25 21:03:45 +00:00

ContentProviderClient.java

Unihiding REFRESH_SUPPORTED and ContentProviderClient#refresh.

2016-12-21 11:45:33 -08:00

ContentProviderNative.java

Remove support for auto-paging of cursors.

2017-04-13 00:35:42 +00:00

ContentProviderOperation.java

Replace possibly-expensive size() == 0 with isEmpty()

2017-03-24 15:10:41 -07:00

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev

2017-04-29 17:38:59 +00:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

Replace possibly-expensive size() == 0 with isEmpty()

2017-03-24 15:10:41 -07:00

Context.java

Merge "Remove redundant TextClassificationService" into oc-dev

2017-05-09 16:59:38 +00:00

ContextWrapper.java

Persistable accessibility ID from ContextWrappers

2017-05-08 13:29:17 -07:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

Clean up DialogInterface lint warnings, docs, ws

2017-02-03 10:23:45 -05:00

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

Replace ContentProvider SQL args w/ Bundle & Constants.

2016-12-09 12:31:44 -08:00

IContentService.aidl

Require valid authorities for Uri notifications.

2017-02-24 11:00:59 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist

2017-05-10 17:23:02 -07:00

Intent.aidl

…

Intent.java

Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev

2017-05-01 16:42:24 +00:00

IntentFilter.aidl

…

IntentFilter.java

Add concept of implicitly exposed components

2017-04-25 13:34:23 -07:00

IntentSender.aidl

…

IntentSender.java

Fix issue #38393543: Not allowed to start service Intent

2017-05-19 16:12:08 -07:00

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

QuickViewConstants.java

Add flags for quick viewer to indicate capabilities of a document.

2017-03-30 17:50:53 -07:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

…

RestrictionsManager.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

Fix issue #37470038: API Review: ServiceConnection.onBindingDead()

2017-04-19 14:53:43 -07:00

SharedPreferences.java

…

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncRequest.aidl

…

SyncRequest.java

Fix requiresCharging false value ignored issue

2017-02-06 20:11:42 +00:00

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

…

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…