Neil Fuller 79d42a61e4 resolve merge conflicts of 5e1d95b0cc to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790

2018-06-12 14:23:51 +01:00

..

admin

Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev

2018-05-09 16:06:43 +00:00

assist

DO NOT MERGE - Disable warning on blocking one-way call from autofill server.

2018-03-07 19:24:45 +00:00

backup

docs: Backup requestRestore() doesn't kill app during restore.

2018-06-06 09:08:11 +00:00

job

API council requested tweaks to JobInfo.

2018-03-27 08:41:42 -06:00

servertransaction

Preserve custom activity intent on relaunch

2018-05-02 18:40:59 -07:00

slice

Don't use stable providers for slices

2018-05-31 14:12:52 -04:00

timedetector

Minimum viable TimeDetectorService

2018-06-11 15:29:57 +01:00

timezone

Split query permission from update permission

2018-02-12 15:15:13 +00:00

trust

Allow custom keyguard transient message

2018-01-10 14:07:56 -08:00

usage

Merge "Tweak exemption for sync requests made by FG apps" into pi-dev

2018-05-24 23:22:09 +00:00

ActionBar.java

Add more IntDef prefixes for auto-documenting.

2017-12-13 20:05:36 -07:00

Activity.java

Merge "Adde back check to make sure Activity.recreate() is called on main thread." into pi-dev

2018-05-17 05:01:33 +00:00

ActivityGroup.java

Don't require post-execution state for onActivityResult

2018-04-20 12:58:49 -07:00

ActivityManager.aidl

…

ActivityManager.java

Consider window background opacity when determining snapshot translucency

2018-06-06 19:40:27 -07:00

ActivityManagerInternal.java

Allow except-idle whitelisted apps to start BG services in EBS

2018-06-04 15:31:42 -07:00

ActivityManagerNative.java

Support chained attribution for alarm related WorkSources.

2018-01-03 09:16:56 +00:00

ActivityOptions.java

Update Javadoc of setLockTaskEnabled to reflect known issue

2018-04-05 12:36:31 +00:00

ActivityThread.java

Serialize AM.getContentProvider() calls in client side

2018-05-31 14:52:51 -07:00

ActivityTransitionCoordinator.java

…

ActivityTransitionState.java

…

ActivityView.java

Add a path to allow detection of task changes to the top of the ActivityView

2018-05-04 12:15:29 -07:00

AlarmManager.aidl

…

AlarmManager.java

Pass in the user defined by Context.

2018-02-03 02:11:45 +00:00

AlertDialog.java

DO NOT MERGE Make "Want to start battery saver?" dialog better.

2018-04-25 15:27:47 +00:00

AliasActivity.java

…

AppComponentFactory.java

Add more AppComponentFactory docs

2018-03-30 09:57:36 -04:00

AppGlobals.java

…

Application.java

Improved Application.getAutofillClient()

2018-03-14 13:04:28 -07:00

ApplicationErrorReport.aidl

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

In place split install native support

2018-04-30 20:33:36 +00:00

ApplicationPackageManager.java

Protect usage data with OP_GET_USAGE_STATS.

2018-04-19 15:46:59 -06:00

ApplicationThreadConstants.java

…

AppOpsManager.aidl

…

AppOpsManager.java

Fix for missing location icon

2018-05-28 21:20:56 -07:00

AppOpsManagerInternal.java

Allow device/profile owners to change app ops modes.

2018-05-14 11:29:43 -07:00

AuthenticationRequiredException.java

…

AutomaticZenRule.aidl

…

AutomaticZenRule.java

…

BackStackRecord.java

…

BroadcastOptions.java

Added dontSendToRestrictedApps broadcast option

2018-04-04 16:39:24 -07:00

ClientTransactionHandler.java

Preserve custom activity intent on relaunch

2018-05-02 18:40:59 -07:00

ContentProviderHolder.aidl

…

ContentProviderHolder.java

…

ContextImpl.java

Require READ_CALL_LOG permission to see phone numbers in phone state.

2018-05-18 14:37:43 -07:00

DatePickerDialog.java

…

DexLoadReporter.java

…

Dialog.java

Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev

2018-06-07 21:18:10 -07:00

DialogFragment.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

DownloadManager.java

…

EnterTransitionCoordinator.java

…

EphemeralResolveInfo.aidl

…

ExitTransitionCoordinator.java

…

ExpandableListActivity.java

…

Fragment.java

Merge "Fix javadoc typo causing broken links" into oc-mr1-dev

2018-03-07 01:54:15 +00:00

FragmentBreadCrumbs.java

…

FragmentContainer.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentController.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentHostCallback.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentManager.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentManagerNonConfig.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentState.java

…

FragmentTransaction.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

FragmentTransition.java

…

GrantedUriPermission.aidl

Internal Framework changes needed by DocumentUI's ScopedAccessProvider:

2018-01-25 11:04:29 -08:00

GrantedUriPermission.java

Internal Framework changes needed by DocumentUI's ScopedAccessProvider:

2018-01-25 11:04:29 -08:00

IActivityController.aidl

…

IActivityManager.aidl

Defer resizing invisible stacks while drag resizing

2018-04-20 15:09:02 +02:00

IActivityPendingResult.aidl

…

IAlarmCompleteListener.aidl

…

IAlarmListener.aidl

…

IAlarmManager.aidl

Better handling of NTP-based clocks.

2018-02-16 22:11:35 +00:00

IApplicationThread.aidl

Switch activity relaunch to lifecycler

2018-02-08 00:05:09 -08:00

IAppTask.aidl

…

IAssistDataReceiver.aidl

…

IBackupAgent.aidl

Add #getTransportFlags to BackupDataOutput

2018-01-25 09:28:55 +00:00

IEphemeralResolver.aidl

…

IInputForwarder.aidl

…

IInstantAppResolver.aidl

Revert "Revert "Adds generic intent Instant App resolution""

2018-01-31 14:00:18 -08:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Don't mute ringer if apps can bypass dnd

2018-04-18 14:10:19 -04:00

InstantAppResolveInfo.aidl

…

InstantAppResolverService.java

Addresses API feedback for Intent Discovery change

2018-03-01 10:03:05 -08:00

Instrumentation.java

Make Instrumentation more robust to other inputs

2018-04-18 15:43:50 -04:00

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

ITaskStackListener.aidl

…

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

…

IUidObserver.aidl

…

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

Do not block ambient mode IPC

2018-01-04 21:36:00 -08:00

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

…

KeyguardManager.java

Pass in the user defined by Context.

2018-02-03 02:11:45 +00:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

LoadedApk.java

Fix: vendor public libraries are accessible via System.loadLibrary

2018-06-04 15:31:47 +00:00

LoaderManager.java

Improve Fragment+Loader deprecation Javadoc

2017-12-20 18:16:40 +00:00

LocalActivityManager.java

Improve temporary logging around activity destruction.

2018-02-09 07:56:49 -08:00

MediaRouteActionProvider.java

…

MediaRouteButton.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

Further interruptiveness changes

2018-06-05 09:01:32 -04:00

NotificationChannel.aidl

…

NotificationChannel.java

Work on issue #77931346: The notification that should not be named appeared

2018-05-01 22:56:23 -07:00

NotificationChannelGroup.aidl

…

NotificationChannelGroup.java

Update notification blocking documentation.

2018-03-29 16:39:06 -04:00

NotificationManager.aidl

…

NotificationManager.java

Enable Notifications on AndroidTV

2018-04-26 12:48:04 +00:00

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

Opportunistic typo fix

2018-06-07 14:55:31 +09:00

Person.java

Migrated the Person class to its own file

2018-04-05 17:21:11 -07:00

PictureInPictureArgs.java

…

PictureInPictureParams.aidl

…

PictureInPictureParams.java

…

Presentation.java

…

ProcessMemoryState.java

Implement atom puller for ProcessMemoryState.

2018-02-15 13:43:55 -08:00

ProfilerInfo.aidl

…

ProfilerInfo.java

Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp

2018-01-25 23:03:11 +00:00

ProgressDialog.java

…

QueuedWork.java

…

RecoverableSecurityException.java

…

RemoteAction.aidl

…

RemoteAction.java

Fixing incomplete RemoteAction clone

2018-04-05 21:22:51 +02:00

RemoteInput.java

Update RemoteInput#setChoices documentation

2018-05-15 19:46:57 +00:00

ResourcesManager.java

Reduce LoadedApkAssets LRU cache size.

2018-05-22 10:52:40 +01:00

ResultInfo.aidl

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

Update javadoc for SearchManager api on TV.

2018-02-28 15:33:32 -08:00

Service.java

Fix issue #72116995: Add permission guarding Service#startForeground

2018-03-05 16:59:21 -08:00

ServiceStartArgs.aidl

…

ServiceStartArgs.java

…

SharedElementCallback.java

…

SharedPreferencesImpl.java

Frameworks: Move SharedPreferencesImpl to tristate

2018-01-05 18:02:30 -08:00

StatsManager.java

Marks deprecated StatsManager APIs.

2018-05-21 17:40:56 -07:00

StatusBarManager.java

Add disable2 flag for rotate suggestions

2018-03-16 12:35:21 -07:00

SynchronousUserSwitchObserver.java

…

SystemServiceRegistry.java

resolve merge conflicts of 5e1d95b0cc to stage-aosp-master

2018-06-12 14:23:51 +01:00

TabActivity.java

…

TaskStackBuilder.java

Pass in the user defined by Context.

2018-02-03 02:11:45 +00:00

TaskStackListener.java

…

TimePickerDialog.java

…

UiAutomation.java

Allow UiAutomation being used off the main thread

2018-05-21 09:55:32 -07:00

UiAutomationConnection.java

…

UiModeManager.java

Add more IntDef prefixes for auto-documenting.

2017-12-13 20:05:36 -07:00

UserSwitchObserver.java

…

VoiceInteractor.aidl

…

VoiceInteractor.java

…

Vr2dDisplayProperties.aidl

…

Vr2dDisplayProperties.java

…

VrManager.java

Add support for VR InputMethod.

2017-12-08 00:55:11 +00:00

VrStateCallback.java

…

WaitResult.aidl

…

WaitResult.java

…

WallpaperColors.aidl

…

WallpaperColors.java

Merge "Revert "WallpaperColors hint computation"" into pi-dev

2018-05-24 20:00:27 +00:00

WallpaperInfo.aidl

…

WallpaperInfo.java

Support wallpapers in AoD

2017-12-18 11:28:16 -08:00

WallpaperManager.java

Just drop the default WP bitmap, don't explicitly recycle it

2018-05-02 13:18:35 -07:00

WindowConfiguration.aidl

…

WindowConfiguration.java

Use correct windowingMode when computing override config

2018-04-26 13:14:36 -07:00