Mathieu Chartier 8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp ...

Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43

2015-06-24 15:59:18 -07:00

..

admin

Reset permission policy to default when device owner goes away

2015-06-24 17:19:19 +01:00

assist

Fix issue #20654534: API Review: android.app.assist

2015-06-23 13:09:21 -07:00

backup

Revert "Backup/restore recents task list"

2015-05-18 16:00:15 -07:00

job

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

trust

Only enable fingerprint auth after first regular auth

2015-05-05 11:43:42 -07:00

usage

system_server: optimize app idle parole state change

2015-06-22 15:35:19 -07:00

ActionBar.java

Use new hierarchy viewer protocol in all View subclasses

2015-05-07 18:44:21 -07:00

Activity.java

Fix leak for MenuInflater + setActionBar

2015-06-22 10:05:38 +01:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp

2015-06-24 15:59:18 -07:00

ActivityManagerInternal.java

Disable multi-user background recording

2015-05-08 17:17:16 -07:00

ActivityManagerNative.java

Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()

2015-06-24 13:35:46 -07:00

ActivityOptions.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

ActivityThread.java

resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp

2015-06-24 15:59:18 -07:00

ActivityTransitionCoordinator.java

Merge "Disable input during Activity Transition." into mnc-dev

2015-05-11 17:19:03 +00:00

ActivityTransitionState.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ActivityView.java

am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev

2015-06-05 02:18:35 +00:00

AlarmManager.aidl

…

AlarmManager.java

am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev

2015-06-12 19:54:28 +00:00

AlertDialog.java

Fix application of default dialog theme

2015-04-10 12:42:57 -07:00

AliasActivity.java

…

AppGlobals.java

…

AppImportanceMonitor.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Application.java

Annotate Application with @CallSuper

2015-05-06 09:44:53 -07:00

ApplicationErrorReport.java

[ActivityManager] Avoid NullPointerException if no

2015-04-08 18:04:11 +08:00

ApplicationLoaders.java

…

ApplicationPackageManager.java

Add system API to watch for permission changes

2015-06-10 21:24:13 -07:00

ApplicationThreadNative.java

resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp

2015-06-24 15:59:18 -07:00

AppOpsManager.aidl

…

AppOpsManager.java

Make AppOpsManager#permissionToOp API public

2015-06-14 00:50:38 +00:00

BackStackRecord.java

Limit shared element transition to shared elements and children.

2015-06-11 13:23:17 -07:00

BroadcastOptions.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

ContextImpl.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

DatePickerDialog.java

Force-commit changes on accept in spinner-style DatePickerDialog

2015-01-13 17:34:17 -08:00

Dialog.java

Move PhoneWindow and friends back into internal package

2015-05-06 15:57:09 -07:00

DialogFragment.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

DownloadManager.java

Document that DownloadManager supports HTTPS.

2015-06-11 14:34:44 -07:00

EnterTransitionCoordinator.java

Merge "Remove hidden/deleted APIs." into mnc-dev

2015-05-15 14:08:19 +00:00

ExitTransitionCoordinator.java

Disable input during Activity Transition.

2015-05-07 08:36:28 -07:00

ExpandableListActivity.java

…

Fragment.java

Use who when requesting permissions

2015-06-09 18:17:44 -07:00

FragmentBreadCrumbs.java

Fix bug #17521147 Settings activity looks terrible on Volantis

2014-09-26 13:38:12 -07:00

FragmentContainer.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

FragmentController.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

FragmentHostCallback.java

Use who when requesting permissions

2015-06-09 18:17:44 -07:00

FragmentManager.java

Set a HW layer for Fragment alpha animation

2015-05-22 16:45:02 -07:00

FragmentTransaction.java

Remove hidden/deleted APIs.

2015-05-14 14:12:16 -07:00

IActivityContainer.aidl

am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

2015-03-03 22:25:13 +00:00

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()

2015-06-24 13:35:46 -07:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

Work on issue #20401752: device idle and alarms.

2015-04-21 16:59:12 -07:00

IApplicationThread.java

resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp

2015-06-24 15:59:18 -07:00

IAppTask.aidl

…

IBackupAgent.aidl

Add payload-size preflight stage to full transport backup

2015-03-26 18:57:36 -07:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Zen: New user flow for requesting DND access.

2015-06-08 11:53:35 -04:00

Instrumentation.java

Fix issue #21621920: VI: need mechanism to get current request

2015-06-09 14:15:49 -07:00

IntentService.java

Annotate some APIs with threading annotations

2015-04-23 22:14:19 +00:00

IProcessObserver.aidl

…

ISearchManager.aidl

Pass an args bundle to launchAssistAction.

2015-06-05 23:26:39 +00:00

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

ITaskStackListener.aidl

Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)

2014-12-02 15:34:20 -08:00

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

…

IUidObserver.aidl

Update power manager to track uid state like netstats.

2015-05-18 18:13:41 -07:00

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

Add foreground profile changed to user switch observer.

2015-04-13 18:03:05 +00:00

IWallpaperManager.aidl

Block setting wallpapers from managed profiles.

2015-03-09 10:39:21 +00:00

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

…

KeyguardManager.java

Clarify javadoc of isKeyguardSecure and isDeviceSecure

2015-04-29 14:02:55 -07:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Add path to native libraries inside apk

2015-06-11 10:48:22 -07:00

LoaderManager.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

LocalActivityManager.java

Add Activity API to get referrer information.

2014-11-11 00:42:18 +00:00

MediaRouteActionProvider.java

…

MediaRouteButton.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

Merge "remove setLatestEventInfo" into mnc-dev

2015-06-24 22:17:45 +00:00

NotificationManager.aidl

Zen: Simplify notification policy api, add zenmode api.

2015-05-08 13:34:30 -04:00

NotificationManager.java

Patch up certain kinds of broken notifications.

2015-06-18 15:12:44 -04:00

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

Presentation.java

Support 4K overlay displays.

2015-06-09 19:52:23 -07:00

ProfilerInfo.java

…

ProgressDialog.java

…

QueuedWork.java

…

RemoteInput.java

…

ResourcesManager.java

Use DisplayAdjustments when creating display in ResourceManager

2015-06-06 11:26:33 -07:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

SearchDialog.java

Allow Floating ActionModes in SearchDialog.

2015-05-01 15:38:01 +01:00

SearchManager.java

Pass an args bundle to launchAssistAction.

2015-06-05 23:26:39 +00:00

Service.java

Mark Service#onBind() @Nullable

2015-02-19 15:31:11 -08:00

SharedElementCallback.java

Merge "Improve javadoc on SharedElementCallback."

2015-04-13 16:53:43 +00:00

SharedPreferencesImpl.java

Add some @Nullable annotations to SharedPreferences

2015-01-30 15:37:45 -08:00

StatusBarManager.java

Add status bar flag to disable quick settings

2015-04-28 18:49:47 +01:00

SystemServiceRegistry.java

MidiManager: proxy all requests to open devices through MidiService

2015-06-04 19:16:23 -07:00

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

Implement landscape layout for time picker dialog

2015-02-26 09:47:10 -08:00

UiAutomation.java

Fixed broken link in UiAutomation.setRunAsMonkey() method description.

2015-04-07 13:04:39 -07:00

UiAutomationConnection.java

clean up Process instance after we are done with the sub process

2015-06-07 16:16:15 -07:00

UiModeManager.java

Add support for user-selectable night mode

2015-02-12 11:01:06 -08:00

VoiceInteractor.aidl

Allow different visual and voice assist prompts

2015-06-05 16:36:22 -07:00

VoiceInteractor.java

Fix issue #20654534: API Review: android.app.assist

2015-06-22 15:14:17 -07:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Block setting wallpapers from managed profiles.

2015-03-09 10:39:21 +00:00