Nicolas Geoffray f95fb4fb17 resolve merge conflicts of 4b092e4 to master ...

Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40

2016-05-31 13:35:41 +01:00

..

pm

resolve merge conflicts of 4b092e4 to master

2016-05-31 13:35:41 +01:00

res

Don't call .toString() on potentially null CharSequence

2016-05-27 17:13:10 -07:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

…

ClipboardManager.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

ClipData.aidl

…

ClipData.java

Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev

2016-05-04 17:07:13 +00:00

ClipDescription.aidl

…

ClipDescription.java

Hide unnecessary extra name constants in ClipDescription

2016-04-05 17:12:25 -07:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

…

ContentProviderClient.java

…

ContentProviderNative.java

…

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Fix issue #28431297: Crash in system process

2016-04-27 17:03:52 -07:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

ContentValues: improve documentation

2016-05-12 16:51:52 -07:00

Context.java

Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860

2016-05-27 20:08:59 +00:00

ContextWrapper.java

…

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

…

IContentService.aidl

More work on issue #26390151: Add new JobScheduler API...

2016-04-05 15:58:42 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

Fix issue #27532364: Security Vulnerability in IIntentSender.send

2016-05-13 17:37:08 -07:00

Intent.aidl

…

Intent.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

IntentFilter.aidl

…

IntentFilter.java

Adjust javadoc for filter priority

2016-04-06 10:57:51 -07:00

IntentSender.aidl

…

IntentSender.java

Fix issue #27532364: Security Vulnerability in IIntentSender.send

2016-05-13 17:37:08 -07:00

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Don't lose content change during rollback for loader already started

2016-04-27 13:45:38 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

…

RestrictionsManager.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncRequest.aidl

…

SyncRequest.java

…

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

…

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…