Geoffrey Pitsch 3fe668a015 resolve merge conflicts of 180f4ee7f7 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6a7751e75899c5faf32bb2b392fa623d6482e7b

2017-07-21 10:35:11 -04:00

..

admin

Opt-out for always-on VPN

2017-07-18 00:55:38 +01:00

assist

Fixed updateAutofillValue() when mText is not set.

2017-06-19 11:43:33 -07:00

backup

Improve logging when restore fails to load Package Manager.

2017-07-12 16:34:50 +00:00

job

Add reporting of how jobs complete.

2017-06-28 17:44:00 -07:00

timezone

Remove TODOs that are not needed

2017-07-17 17:57:11 +01:00

trust

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

2017-06-06 15:48:24 +00:00

usage

Change storage migration to use quota APIs.

2017-07-06 11:29:10 -06:00

ActionBar.java

…

Activity.java

Added Activity flags to show on lock screen.

2017-06-29 13:33:43 -07:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

Fix issue #34471029: Don't allow audio use from background apps.

2017-07-10 17:24:20 +01:00

ActivityManagerInternal.java

Merge "Use correct timestamps of events for logging." into oc-dev

2017-06-15 19:25:08 +00:00

ActivityManagerNative.java

…

ActivityOptions.java

Fix backwards flag causing crash.

2017-06-16 11:07:29 -07:00

ActivityThread.java

Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev am: e00bcc0fef

2017-07-19 01:06:34 +00:00

ActivityTransitionCoordinator.java

Protect shared element transitions from removed views.

2017-05-04 15:48:33 -07:00

ActivityTransitionState.java

…

ActivityView.java

VirtualDisplay wrapper with input forwarding

2017-07-19 14:52:06 -07:00

AlarmManager.aidl

…

AlarmManager.java

Fix #62350081 - annotate permission requirements

2017-06-05 18:30:05 -07:00

AlertDialog.java

Add ResourceId validation helper method

2017-05-24 15:39:23 -07:00

AliasActivity.java

…

AppGlobals.java

…

Application.java

Add API to allow apps more control over instantiation

2017-06-22 13:18:27 -04:00

ApplicationErrorReport.aidl

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

Allow splits to declare a classloader type.

2017-07-06 11:57:36 +01:00

ApplicationPackageManager.java

Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit

2017-05-31 14:54:24 +00:00

ApplicationThreadConstants.java

…

AppOpsManager.aidl

…

AppOpsManager.java

Active camera apps can defy reserved cache space.

2017-06-12 14:27:23 -06:00

AuthenticationRequiredException.java

Remove snippet regarding ContentProvider#notifyChange in documentation.

2017-05-02 13:35:13 -07:00

AutomaticZenRule.aidl

…

AutomaticZenRule.java

…

BackStackRecord.java

Address API feedback for new fragment APIs

2017-04-27 12:35:15 -07:00

BroadcastOptions.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

ContentProviderHolder.aidl

…

ContentProviderHolder.java

…

ContextImpl.java

Don't crash when external storage is unmounted

2017-07-14 16:00:36 -07:00

DatePickerDialog.java

…

DexLoadReporter.java

Register secondary dex files for JIT profiling

2017-03-28 16:00:21 -07:00

Dialog.java

Add ResourceId validation helper method

2017-05-24 15:39:23 -07:00

DialogFragment.java

Make public getFragments() and onGetLayoutInflater() methods

2017-03-29 14:58:42 -07:00

DownloadManager.java

Test if allocation supported; @removed clean up.

2017-07-15 21:08:56 -06:00

EnterTransitionCoordinator.java

…

EphemeralResolveInfo.aidl

…

EphemeralResolverService.java

…

ExitTransitionCoordinator.java

…

ExpandableListActivity.java

…

Fragment.java

Fix Fragment.onCreate() not being called in some cases.

2017-07-19 10:51:17 -07:00

FragmentBreadCrumbs.java

…

FragmentContainer.java

Hide FragmentContainer#instantiate for API 26

2017-05-01 14:26:54 -07:00

FragmentController.java

Ensuring multi-window callbacks contain new configuration and are in order

2017-03-31 17:04:26 -07:00

FragmentHostCallback.java

Update more implementations of findViewById()

2017-04-13 16:50:32 -04:00

FragmentManager.java

Fix Fragment.onCreate() not being called in some cases.

2017-07-19 10:51:17 -07:00

FragmentManagerNonConfig.java

…

FragmentState.java

Move FragmentState out of Fragments.java [framework edition]

2017-04-20 16:42:05 +00:00

FragmentTransaction.java

Address API feedback for new fragment APIs

2017-04-27 12:35:15 -07:00

FragmentTransition.java

Address API council feedback.

2017-04-26 14:37:57 -07:00

IActivityController.aidl

…

IActivityManager.aidl

Merge changes from topic 'activity_view_v2'

2017-07-20 15:48:26 +00:00

IActivityPendingResult.aidl

…

IAlarmCompleteListener.aidl

…

IAlarmListener.aidl

…

IAlarmManager.aidl

…

IApplicationThread.aidl

Implement dumpheap -m.

2017-07-12 16:06:20 -07:00

IAppTask.aidl

…

IBackupAgent.aidl

…

IEphemeralResolver.aidl

…

IInputForwarder.aidl

VirtualDisplay wrapper with input forwarding

2017-07-19 14:52:06 -07:00

IInstantAppResolver.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Migrate managed services from setting to policy xml

2017-06-19 17:43:30 +00:00

InstantAppResolveInfo.aidl

…

InstantAppResolverService.java

fix service binding

2017-04-21 14:43:52 -07:00

Instrumentation.java

Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev am: c672cb5ed9

2017-06-02 16:25:07 +00:00

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

Framework support to improve bg check CTS tests.

2017-03-31 17:58:38 -07:00

IStopUserCallback.aidl

…

ITaskStackListener.aidl

Updating Overview to work with PiP

2017-05-12 11:01:36 -07:00

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

Fix GamepadTestCase#testButtonA CTS test

2017-05-12 21:01:02 +00:00

IUidObserver.aidl

Fix issue #34471029: Don't allow audio use from background apps.

2017-07-10 17:24:20 +01:00

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

Require READ_EXTERNAL_STORAGE to read wallpaper imagery

2017-07-05 18:29:53 +00:00

IWallpaperManagerCallback.aidl

Wallpaper color extraction

2017-04-26 18:59:32 +00:00

JobSchedulerImpl.java

Add new "work queue" feature to JobScheduler.

2017-04-11 13:57:15 -07:00

KeyguardManager.java

Added Activity flags to show on lock screen.

2017-06-29 13:33:43 -07:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Allow splits to declare a classloader type.

2017-07-06 11:57:36 +01:00

LoaderManager.java

…

LocalActivityManager.java

…

MediaRouteActionProvider.java

…

MediaRouteButton.java

Change Media Route Button animation images

2017-07-11 18:08:10 -07:00

NativeActivity.java

…

Notification.aidl

…

Notification.java

Reducing bitmap sizes in notifications

2017-07-19 11:05:26 -07:00

NotificationChannel.aidl

…

NotificationChannel.java

Fix system crash

2017-07-13 11:35:46 -04:00

NotificationChannelGroup.aidl

…

NotificationChannelGroup.java

Api updates

2017-04-25 17:00:05 -04:00

NotificationManager.aidl

…

NotificationManager.java

Allow apps to downgrade importance in createNotificationChannel

2017-07-20 12:45:30 -04:00

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

Merge "Small doc fix." into oc-dev am: 0f98ddaa01

2017-06-21 02:52:52 +00:00

PictureInPictureArgs.java

Preserve non-floating state when entering pinned stack.

2017-05-10 15:16:17 -07:00

PictureInPictureParams.aidl

Updating PiP API and documentation.

2017-04-26 17:14:19 -07:00

PictureInPictureParams.java

Preserve non-floating state when entering pinned stack.

2017-05-10 15:16:17 -07:00

Presentation.java

…

ProfilerInfo.aidl

…

ProfilerInfo.java

Frameworks: Add agent to ProfilerInfo

2017-06-29 20:42:32 -07:00

ProgressDialog.java

docs: Described why ProgressDialog is now deprecated.

2017-06-29 14:01:43 -07:00

QueuedWork.java

…

RecoverableSecurityException.java

Remove snippet regarding ContentProvider#notifyChange in documentation.

2017-05-02 13:35:13 -07:00

RemoteAction.aidl

…

RemoteAction.java

…

RemoteInput.java

Updating docs for RemoteInput non-textual inputs per API review request.

2017-04-26 20:51:08 +00:00

ResourcesManager.java

Temporary remove resource-display caching

2017-04-17 16:56:55 +00:00

ResultInfo.aidl

…

ResultInfo.java

…

RetailDemoModeServiceInternal.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

SearchManager.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

Service.java

Don't keep a reference to Service object

2017-05-23 10:37:09 -07:00

ServiceStartArgs.aidl

Deliver start service args with ParcelledListSlice.

2017-04-04 16:12:10 -07:00

ServiceStartArgs.java

Deliver start service args with ParcelledListSlice.

2017-04-04 16:12:10 -07:00

SharedElementCallback.java

…

SharedPreferencesImpl.java

Make SharedPreferences check with higher precision

2017-07-19 15:04:12 +00:00

StatusBarManager.java

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

2017-06-06 15:48:24 +00:00

SynchronousUserSwitchObserver.java

…

SystemServiceRegistry.java

Merge "SystemServer: Support for LowpanService"

2017-07-10 20:20:18 +00:00

TabActivity.java

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

TaskStackBuilder.java

…

TaskStackListener.java

Updating Overview to work with PiP

2017-05-12 11:01:36 -07:00

TimePickerDialog.java

Fix TimePickerDialog positive button clicks.

2017-05-31 15:10:25 -07:00

UiAutomation.java

Fix GamepadTestCase#testButtonA CTS test

2017-05-12 21:01:02 +00:00

UiAutomationConnection.java

Fix GamepadTestCase#testButtonA CTS test

2017-05-12 21:01:02 +00:00

UiModeManager.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

UserSwitchObserver.java

…

VoiceInteractor.aidl

…

VoiceInteractor.java

…

Vr2dDisplayProperties.aidl

Rename CompatibilityDisplay to Vr2dDisplay

2017-05-03 22:16:02 -07:00

Vr2dDisplayProperties.java

Add ability to turn off VR virtual display functionality.

2017-06-29 19:01:39 +00:00

VrManager.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

WaitResult.aidl

…

WaitResult.java

Check component before notifying activity is visible.

2017-04-06 10:11:58 -07:00

WallpaperColors.aidl

Wallpaper color extraction

2017-04-26 18:59:32 +00:00

WallpaperColors.java

Don't recycle bitmaps we don't own

2017-07-17 16:35:29 +00:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Require READ_EXTERNAL_STORAGE to read wallpaper imagery

2017-07-05 18:29:53 +00:00