Philip P. Moltmann 492a058d58 resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp ...

am: b02f8eb241

Change-Id: I1307ea308423c0fd34564d788ab64c023a5be2c5

2017-02-14 18:28:25 +00:00

..

om

OMS: introduce the OverlayManagerService

2017-01-26 17:04:53 -08:00

pm

Merge "Declarative downloadable fonts"

2017-02-14 15:39:04 +00:00

res

Declarative downloadable fonts

2017-02-14 13:32:41 +00:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp

2017-02-14 18:28:25 +00:00

ClipboardManager.java

Avoid caching services with missing binders.

2016-08-11 09:44:30 -06:00

ClipData.aidl

…

ClipData.java

Add ClipData.addItem(Item, ContentResolver)

2017-01-20 15:39:12 -08:00

ClipDescription.aidl

…

ClipDescription.java

Add new api ClipDescription.getTimestamp.

2017-01-30 17:19:49 -08:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

Add OFFSET and LENGTH args for paged queries.

2017-01-12 17:33:49 -08:00

ContentProviderClient.java

Unihiding REFRESH_SUPPORTED and ContentProviderClient#refresh.

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

ContentProviderNative.java

Replace ContentProvider SQL args w/ Bundle & Constants.

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

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Add OFFSET and LENGTH args for paged queries.

2017-01-12 17:33:49 -08:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

Also parse "1" as true for ContentValues#getAsBoolean

2017-01-19 16:19:28 +00:00

Context.java

CompanionDeviceManager

2017-02-06 12:50:55 -08:00

ContextWrapper.java

Add support for Split APK dependcies

2017-01-24 18:34:08 -08:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

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

…

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Refactor auto-fill

2017-02-13 21:31:37 -08:00

IntentFilter.aidl

…

IntentFilter.java

PackageParser: Add serialization mechanism for parse results.

2017-01-03 15:55:09 +00:00

IntentSender.aidl

…

IntentSender.java

Update usage of ActivityManagerNative.

2016-11-14 11:27:12 -08:00

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

docs: fix link in Loader reference page

2016-08-12 15:48:05 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

…

RestrictionsManager.java

Fix the handling of bundle array in RestrictionsManager

2016-06-20 19:41:08 +00:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

docs: add info to SharedPreferences.Editor.putString

2016-08-02 12:10:48 -07:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

Only sync adapters with access can see an account - framework

2016-08-23 21:43:27 +00:00

SyncAdapterType.aidl

…

SyncAdapterType.java

Only sync adapters with access can see an account - framework

2016-08-23 21:43:27 +00:00

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

Fix the API compatibility of "UriMatcher#addURI"

2016-07-30 01:47:50 +00:00

UriPermission.java

…