Adam Skory a7cda03a47 resolved conflicts for merge of 7d17de35 to master ...

Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef

2013-09-11 16:16:19 +01:00

..

pm

Revert services assist context in KitKat

2013-09-11 12:04:58 +01:00

res

Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed...

2013-09-06 14:02:54 -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

Fix a bug where we could lose a loader content change.

2013-03-14 19:17:00 -07:00

BroadcastReceiver.java

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

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

ClipboardManager.java

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

2013-04-03 11:45:44 -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

…

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

Fix getCallingPackage() to handle reentrance.

2013-09-09 18:52:48 -07:00

ContentProviderClient.java

Disabled states, more UX work, bug fixes.

2013-09-09 16:55:35 -07:00

ContentProviderNative.java

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

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

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

am 22902f54: am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev

2013-09-09 15:12:57 -07:00

ContentUris.java

…

ContentValues.aidl

Add ContentValues & CursorWindow to framework.aidl

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

ContentValues.java

…

Context.java

Change build version from KEY_LIME_PIE to KITKAT

2013-09-05 08:44:33 -07:00

ContextWrapper.java

APIs for multiple external storage devices.

2013-08-11 17:07:44 -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

…

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

Fix broken javadocs

2013-09-05 15:58:24 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Revert services assist context in KitKat

2013-09-11 12:04:58 +01:00

IntentFilter.aidl

…

IntentFilter.java

Add new facility for apps to declared their preferred intents.

2013-07-22 15:30:11 -07:00

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

Fix broken javadocs

2013-09-05 15:58:24 -07:00

ISyncStatusObserver.aidl

…

Loader.java

Fix a bug where we could lose a loader content change.

2013-03-14 19:17:00 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

Fix broken javadocs

2013-09-05 15:58:24 -07: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

Fix broken javadocs

2013-09-05 15:58:24 -07:00

SyncRequest.aidl

AnonymousSyncService & SyncRequest.

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

SyncRequest.java

Fix broken javadocs

2013-09-05 15:58:24 -07:00

SyncResult.aidl

…

SyncResult.java

AnonymousSyncService & SyncRequest.

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

SyncService.java

Fix broken javadocs

2013-09-05 15:58:24 -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