Neil Fuller 4cdb25211c am 1913dc11: resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp ...

* commit '1913dc11b1bd6d23a13949f9bfa34ca3029d90a8':
  Migrate Resources.java to use ICU4j drectly.

2015-07-17 10:57:57 +00:00

..

pm

am 71d12704: am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

2015-07-16 23:20:46 +00:00

res

resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp

2015-07-17 11:42:55 +01: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

Fix some documentation typos.

2014-09-30 02:52:26 +00:00

ClipDescription.aidl

…

ClipDescription.java

…

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

Add ComponentName.createRelative methods

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

ContentInsertHandler.java

…

ContentProvider.java

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

2015-07-01 16:20:00 -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

am 808dd5cc: am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev

2015-07-15 02:37:04 +00: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

Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

2015-07-16 22:22:01 +00:00

IntentFilter.aidl

…

IntentFilter.java

Properly scope the "only http/https schemes" intent filter semantics

2015-06-26 17:45:22 -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

…

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

Use factory methods for RestrictionEntry

2015-05-21 15:08:42 -07:00

RestrictionsManager.java

Support for nested bundles in setApplicationRestrictions

2015-03-30 17:59:07 -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

…

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

…