Deepanshu Gupta cf72f25981 Fix incorrect merge conflict to klp-modular-dev-plus-aosp ...

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778f4

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e

2014-04-16 14:46:24 -07:00

..

pm

am 970417c7: Added getLeanbackLaunchIntentForPackage()

2014-04-11 18:58:43 +00:00

res

Fix incorrect merge conflict to klp-modular-dev-plus-aosp

2014-04-16 14:46:24 -07: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

Warn when exposing file:// Uris beyond a process.

2013-04-03 11:45:44 -07:00

ClipboardManager.java

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

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

ClipData.aidl

…

ClipData.java

Warn when exposing file:// Uris beyond a process.

2013-04-03 11:45:44 -07:00

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 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"

2014-03-11 00:11:14 +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

Doc fixups to ContentResolver, MediaRouter.

2014-03-03 10:14:41 -05:00

ContentUris.java

…

ContentValues.aidl

Add ContentValues & CursorWindow to framework.aidl

2013-04-23 08:30:34 +10:00

ContentValues.java

…

Context.java

am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs

2014-04-04 17:42:44 +00:00

ContextWrapper.java

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

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

CursorEntityIterator.java

…

CursorLoader.java

Remove a method

2013-03-14 10:47:10 -07:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IAnonymousSyncAdapter.aidl

AnonymousSyncService & SyncRequest.

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

IClipboard.aidl

App ops: adding operations for reading/writing clipboard.

2013-02-25 18:02:35 -08:00

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

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev

2014-04-11 03:49:37 +00: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

Miscellaneous small documentation fixes.

2014-01-03 19:15:36 +00:00

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

Application restrictions API

2013-03-20 22:29:59 -07:00

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

Document the behavior of 'null' values in SharedPreferences

2013-04-11 16:01:18 -07:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

Move lingering services to services.jar.

2012-12-11 09:50:50 -08:00

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

Allow leading slash in path argument for addURI() method.

2013-03-26 11:20:47 -07:00

UriPermission.java

Require that persistable Uri permissions be taken.

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