fionaxu c95d552de0 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c ...

am: 698e044717

Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d

2016-06-08 17:23:27 +00:00

..

pm

resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c

2016-06-08 17:23:27 +00:00

res

Make ResourceKey always use non-null configuration override.

2015-08-04 15:26:14 -07:00

AbstractThreadedSyncAdapter.java

Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev

2015-06-23 16:45:50 +00:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

Teach receivers, activities, providers, and services app ops.

2015-07-01 16:20:00 -07:00

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

2015-08-14 14:08:43 -07:00

ClipDescription.aidl

…

ClipDescription.java

Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

2015-08-14 14:08:43 -07:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

Add ComponentName.createRelative methods

2015-04-14 15:20:16 -07:00

ContentInsertHandler.java

…

ContentProvider.java

Also check app-ops on path-permissions.

2015-07-24 15:16:11 -07:00

ContentProviderClient.java

Annotate ContentProviderClient arguments.

2015-06-12 09:49:31 -07:00

ContentProviderNative.java

Properly unparcel the PFDs passed to

2015-04-29 13:30:25 -07:00

ContentProviderOperation.java

Add docs for ContentProviderOperations.

2015-06-10 17:39:29 -07:00

ContentProviderResult.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ContentQueryMap.java

…

ContentResolver.java

Make ContentObservers work across profiles

2015-06-29 16:17:55 +01:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

Update docs to reflect adoptable behavior.

2015-10-14 14:41:23 -07:00

ContextWrapper.java

Fix issue #21626564: MMS should be receivied while Dozing

2015-07-14 18:33:08 -07:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

Mark arg and extras @Nullable in ContentProvider#call()

2015-03-01 15:29:58 -08:00

IContentService.aidl

App Standby : Association between content providers and their sync adapter

2015-06-19 15:04:58 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

Intent.aidl

…

Intent.java

Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

2015-08-14 14:08:43 -07:00

IntentFilter.aidl

…

IntentFilter.java

DO NOT MERGE Fix intent filter priorities

2016-04-07 16:40:18 -07:00

IntentSender.aidl

…

IntentSender.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -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

Sync extras bundle comparison can throw NPE

2015-11-12 15:32:44 +00:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

Fixed key comparison in equals method

2015-08-20 10:24:14 -07:00

RestrictionsManager.java

Fixed a typo in convertRestrictionsToBundle JavaDoc

2015-08-21 11:25:55 -07:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"

2015-02-24 10:28:12 +00:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

App Standby : Association between content providers and their sync adapter

2015-06-19 15:04:58 -07:00

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

DO NOT MERGE Redact Account info from getCurrentSyncs

2016-01-21 14:15:11 +00:00

SyncRequest.aidl

…

SyncRequest.java

…

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

Improve undo support for text entered with IME

2015-03-18 14:36:41 -07:00

UndoOperation.java

…

UndoOwner.java

Fix crash in UndoManager after parceling TextView

2015-03-02 13:27:51 -08:00

UriMatcher.java

Frameworks/base: Remove unnecessary Pattern instance

2015-03-07 00:19:01 +00:00

UriPermission.java

…