Nick Kralevich dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp ...

Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0

2014-02-12 11:05:59 -08:00

..

pm

Runtime resource overlay, iteration 2

2014-02-03 11:20:30 +01:00

res

Runtime resource overlay, iteration 2

2014-02-03 11:20:30 +01:00

AbstractThreadedSyncAdapter.java

am 46aae98b: am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."

2013-07-30 15:34:26 -07:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

Isolate calls to each remote DocumentsProvider.

2013-10-02 08:54:02 -07:00

BroadcastReceiver.java

…

ClipboardManager.java

Fix issue #10688644: Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

ClipData.aidl

…

ClipData.java

…

ClipDescription.aidl

…

ClipDescription.java

Docfixes: three typos and escape */*.

2014-01-06 11:44:42 -05:00

ComponentCallbacks2.java

more javadocs for onTrimMemory()

2013-09-13 17:57:16 -07:00

ComponentCallbacks.java

more javadocs for onTrimMemory()

2013-09-13 17:57:16 -07:00

ComponentName.aidl

…

ComponentName.java

Fix issue #10848916: "Always" button is not working.

2013-09-24 14:16:38 -07:00

ContentInsertHandler.java

…

ContentProvider.java

am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

2014-01-14 19:50:38 +00:00

ContentProviderClient.java

Detect wedged ContentProviders, treat as ANR.

2013-10-01 09:50:41 -07:00

ContentProviderNative.java

Cursor leakage due to cancellation signal

2013-12-19 09:08:05 +01:00

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Docfixes: three typos and escape */*.

2014-01-06 11:44:42 -05:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

Improve external storage docs on Context.

2013-10-15 13:01:33 -07:00

ContextWrapper.java

Fix issue #10688644: Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IAnonymousSyncAdapter.aidl

AnonymousSyncService & SyncRequest.

2013-07-24 15:25:29 -07:00

IClipboard.aidl

…

IContentProvider.java

Work on issue #10130785: Restore silence and vibrate settings...

2013-09-06 16:39:59 -07:00

IContentService.aidl

AnonymousSyncService & SyncRequest.

2013-07-24 15:25:29 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage

2014-01-31 11:20:40 -08:00

IntentFilter.aidl

…

IntentFilter.java

Small IntentFilter docs improvement.

2013-10-11 09:40:18 -07:00

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

DO NOT MERGE. Remove service component for KLP.

2013-08-30 21:28:53 +00:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

Allow requiredForAllUsers to work on updates to system apps

2013-05-01 15:31:49 -07:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

SyncManager now returns copy on getCurrentSyncs()

2013-11-13 18:17:54 -08:00

SyncRequest.aidl

AnonymousSyncService & SyncRequest.

2013-07-24 15:25:29 -07:00

SyncRequest.java

Fix infinite boot-loop bug in SM.

2013-10-11 13:18:22 -07:00

SyncResult.aidl

…

SyncResult.java

AnonymousSyncService & SyncRequest.

2013-07-24 15:25:29 -07:00

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

Bugfix 9373708

2013-06-26 20:16:05 +00:00

SyncStatusObserver.java

…

UndoManager.java

Fix issue #10461600: KLP API Review: UndoManager

2013-09-04 17:43:56 -07:00

UndoOperation.java

Fix issue #10461600: KLP API Review: UndoManager

2013-09-04 17:43:56 -07:00

UndoOwner.java

Fix issue #10461600: KLP API Review: UndoManager

2013-09-04 17:43:56 -07:00

UriMatcher.java

…

UriPermission.java

Require that persistable Uri permissions be taken.

2013-09-25 15:16:41 -07:00