Nick Pelly 038cabe024 NFC integration ...

Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>

2010-09-28 22:36:27 -07:00

..

admin

Fix 2737842: Disable KeguardManager API if device policy is enabled

2010-06-08 15:47:52 -07:00

backup

am 73e150c8: provide link to backup guide above the fold

2010-09-20 16:37:32 -07:00

Activity.java

Some battery improvements:

2010-09-20 16:25:01 -07:00

ActivityGroup.java

…

ActivityManager.java

These are not ready to be exposed. Also rename them to be better.

2010-09-03 12:51:28 -07:00

ActivityManagerNative.java

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

ActivityThread.java

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

AlarmManager.java

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

AlertDialog.java

Fix bug 2523989

2010-03-18 13:44:45 -07:00

AliasActivity.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

AppGlobals.java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

Application.java

…

ApplicationErrorReport.java

StrictMode: time violations in Binder calls

2010-07-30 14:28:55 -07:00

ApplicationLoaders.java

Allow native shared libraries in ASEC containers

2010-08-27 16:40:06 -07:00

ApplicationThreadNative.java

Remove memory monitoring from the system watchdog

2010-06-30 14:53:39 -07:00

ContextImpl.java

NFC integration

2010-09-28 22:36:27 -07:00

DatePickerDialog.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

Dialog.java

merge from open-source master

2010-06-02 08:54:47 -07:00

DownloadManager.java

Move DownloadManager to android.app (DO NOT MERGE)

2010-09-27 17:12:47 -07:00

ExpandableListActivity.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

FullBackupAgent.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

IActivityController.aidl

Fix issue #3022508: Crash during media scan

2010-09-23 15:59:28 -07:00

IActivityManager.java

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

donut snapshot

2009-07-31 17:38:20 -07:00

IAlarmManager.aidl

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

IApplicationThread.java

Remove memory monitoring from the system watchdog

2010-06-30 14:53:39 -07:00

IBackupAgent.aidl

Refactor android.backup => android.app.backup

2010-03-05 16:27:15 -08:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

add a optional String to the key of notifications to allow users

2009-09-25 16:01:22 -07:00

Instrumentation.java

Performance measurement framework:

2009-09-11 17:15:15 -07:00

IntentService.java

Fix SDK build.

2010-04-07 13:54:49 +08:00

ISearchManager.aidl

Clean up global search and web search activity finding

2010-02-23 14:27:43 +00:00

ISearchManagerCallback.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

IServiceConnection.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

IWallpaperManager.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

IWallpaperManagerCallback.aidl

First bit of wallpaper work.

2009-08-05 21:29:42 -07:00

KeyguardManager.java

Fix SDK build.

2010-06-07 21:19:16 -07:00

LauncherActivity.java

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

ListActivity.java

fix xml sample error

2010-08-05 15:44:26 -07:00

LoadedApk.java

Allow native shared libraries in ASEC containers

2010-08-27 16:40:06 -07:00

LocalActivityManager.java

…

NativeActivity.java

Use new nativeLibraryPath field for NativeActivity

2010-09-07 10:44:21 -07:00

Notification.aidl

…

Notification.java

Fix doc of fullScreenIntent.

2010-09-09 16:44:01 -07:00

NotificationManager.java

Fix crash when startForeground posts a broken Notification.

2010-08-04 10:52:51 -04:00

package.html

…

PendingIntent.aidl

…

PendingIntent.java

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

ProgressDialog.java

…

QueuedWork.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

ResultInfo.java

…

SearchableInfo.aidl

Move android.server.search.SearchableInfo to android.app

2009-12-04 12:52:51 +00:00

SearchableInfo.java

Guard against NPE in SearchManagerService

2010-04-06 14:48:41 +01:00

SearchDialog.java

Add an option to hide the Voice Search icon.

2010-09-14 10:56:25 -04:00

SearchManager.java

Add an option to hide the Voice Search icon.

2010-09-14 10:56:25 -04:00

Service.java

Add missing word from docs.

2010-08-02 07:54:18 -07:00

StatusBarManager.java

Start moving resources to SystemUI.apk.

2010-06-02 14:48:45 -07:00

SuggestionsAdapter.java

For search suggestions in the search dialog, allow the 'title'

2010-04-15 11:35:47 -04:00

TabActivity.java

…

TimePickerDialog.java

docs: add links from widget classes to tutorials

2010-08-19 17:07:13 -07:00

UiModeManager.java

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

WallpaperInfo.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

WallpaperInfo.java

Fix some bugs.

2010-03-04 11:52:14 -08:00

WallpaperManager.java

Fix most of issue #2271640: Fix wallpaper etc docs

2009-11-18 18:34:19 -08:00