Nicolas Geoffray 8dbb5e51c8 resolve merge conflicts of e017dae587 to stage-aosp-master ...

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

2017-09-13 11:08:36 +01:00

..

health

Annotate @SystemApi with required permissions.

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

storage

Merge "Improve developer docs for storage APIs." into oc-dev

2017-06-13 00:36:09 +00:00

AsyncResult.java

…

AsyncTask.java

SelectionActionModeHelper should use target view's thread

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

BadParcelableException.java

…

BaseBundle.java

Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist

2017-05-10 17:23:02 -07:00

BatteryManager.java

Annotate @SystemApi with required permissions.

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

BatteryManagerInternal.java

…

BatteryProperties.aidl

…

BatteryProperties.java

…

BatteryProperty.aidl

…

BatteryProperty.java

…

BatteryStats.java

Batterystats: fix inappropriate bg timebase reset

2017-07-21 15:26:13 -07:00

Binder.java

Merge "Rename Binder.destroy() to Binder.destroyBinder()." am: a634b38c8e

2017-06-23 10:55:48 +00:00

Broadcaster.java

…

Build.java

Check VintfObject compatibility on boot

2017-05-24 12:22:33 -07:00

Bundle.aidl

…

Bundle.java

Log if parcel size is too large when launching an activity.

2017-05-22 21:24:25 +00:00

CancellationSignal.java

…

CommonClock.java

…

CommonTimeConfig.java

…

CommonTimeUtils.java

…

ConditionVariable.java

…

ConfigUpdate.java

SmartSelection Config installer.

2017-04-19 21:39:41 +01:00

CountDownTimer.java

…

CpuUsageInfo.aidl

…

CpuUsageInfo.java

…

DeadObjectException.java

…

DeadSystemException.java

…

Debug.aidl

…

Debug.java

Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413

2017-07-14 21:54:07 +00:00

DropBoxManager.aidl

…

DropBoxManager.java

Annotate @SystemApi with required permissions.

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

Environment.java

PackageManager: Clean up code related to foreign dex use

2017-03-07 11:39:24 -08:00

FactoryTest.java

Fix a bunch of repeated reads of a ro.* property

2017-01-27 11:04:39 -08:00

FileBridge.java

Move PackageInstaller over to AppFuse.

2017-03-13 13:59:12 -06:00

FileObserver.java

…

FileUriExposedException.java

…

FileUtils.java

Log sync details to rotating log files (userdebug/eng only)

2017-06-23 12:21:58 -07:00

GraphicsEnvironment.java

Init EGL only for HW-accelerated Activities

2017-05-23 17:05:53 -07:00

Handler.java

Work on issue #36891897: Need to ensure foreground services...

2017-06-14 17:33:41 -07:00

HandlerThread.java

Register PackageMonitor for CompanionDeviceManagerService

2017-03-20 13:38:58 -07:00

HardwarePropertiesManager.java

Annotate @SystemApi with required permissions.

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

HidlSupport.java

Add HidlSupport.java for utility methods for HIDL.

2017-03-29 13:07:15 -07:00

HwBinder.java

Add hwbinder library

2017-08-01 11:26:18 +09:00

HwBlob.java

…

HwParcel.java

Validate incoming data properly.

2017-04-27 16:24:26 -07:00

HwRemoteBinder.java

…

IBatteryPropertiesListener.aidl

…

IBatteryPropertiesRegistrar.aidl

Update IBatteryPropertiesRegistrar.aidl to support force updates

2017-03-22 19:32:43 +00:00

IBinder.java

…

ICancellationSignal.aidl

…

IDeviceIdentifiersPolicyService.aidl

…

IDeviceIdleController.aidl

…

IHardwarePropertiesManager.aidl

…

IHwBinder.java

HwBinder: get/register checked exceptions.

2017-01-05 09:22:03 -08:00

IHwInterface.java

…

IIncidentManager.aidl

…

IIncidentReportCompletedListener.aidl

…

IIncidentReportStatusListener.aidl

…

IInterface.java

…

IMaintenanceActivityListener.aidl

…

IMessenger.aidl

…

IncidentManager.java

Annotate @SystemApi with required permissions.

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

IncidentReportArgs.aidl

…

IncidentReportArgs.java

…

INetworkActivityListener.aidl

…

INetworkManagementService.aidl

Add tether offload traffic to interface stats as well.

2017-08-19 10:12:05 +09:00

IPermissionController.aidl

…

IPowerManager.aidl

Added dialog to notify user of thermal shutdown

2017-04-27 09:52:45 -07:00

IProcessInfoService.aidl

…

IProgressListener.aidl

…

IRecoverySystem.aidl

Revert "RecoverySystem: Fix the issue in installPackage()."

2017-01-19 01:31:57 +00:00

IRecoverySystemProgressListener.aidl

…

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

SchedulingPolicyService: specify the beneficiary of priority boost

2017-02-09 09:17:00 -08:00

IServiceManager.java

…

IUpdateLock.aidl

…

IUserManager.aidl

Added isUserNameSet

2017-05-10 15:58:09 -07:00

IVibratorService.aidl

BZZZZZZT! BZZZZZT! New Vibrator APIs

2017-03-20 16:09:51 +00:00

LocaleList.aidl

…

LocaleList.java

…

Looper.java

Work on issue #36891897: Need to ensure foreground services...

2017-06-14 17:33:41 -07:00

MemoryFile.java

…

Message.aidl

…

Message.java

Protobufferize PowerManager dumpsys

2017-02-23 15:19:11 -08:00

MessageQueue.java

Work on issue #36891897: Need to ensure foreground services...

2017-06-14 17:33:41 -07:00

Messenger.aidl

…

Messenger.java

…

NetworkOnMainThreadException.java

…

NullVibrator.java

BZZZZZZT! BZZZZZT! New Vibrator APIs

2017-03-20 16:09:51 +00:00

OperationCanceledException.java

…

package.html

…

Parcel.java

Merge "Fix typo in Parcel javadoc." am: ed0e6009df am: d29e275b5b

2017-07-11 11:23:55 +00:00

Parcelable.java

Even more auto-doc work.

2017-04-24 13:20:46 -06:00

ParcelableException.java

Add Binder support for Parcelable exceptions.

2017-01-17 14:22:07 -07:00

ParcelableParcel.aidl

…

ParcelableParcel.java

…

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

Specify behavior around DocumentsProvider#openDocument().

2017-05-16 13:13:23 -07:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

Expose Instant App API defined in MR1

2017-03-07 11:40:59 -08:00

PerformanceCollector.java

…

PersistableBundle.java

Implement issue #36590595: Add ability to associated a ClipData with JobInfo

2017-03-31 10:41:50 -07:00

PooledStringReader.java

…

PooledStringWriter.java

…

PowerManager.java

Annotate @SystemApi with required permissions.

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

PowerManagerInternal.java

Fix lock contention: Call into power manager service from handler

2017-05-03 13:22:47 +02:00

PowerSaveState.aidl

Add BatterySaverPolicy for power save mode

2017-03-08 09:20:36 -08:00

PowerSaveState.java

Hook up data saver to battery saver.

2017-03-22 15:55:21 -07:00

Process.java

resolve merge conflicts of e017dae587 to stage-aosp-master

2017-09-13 11:08:36 +01:00

ProxyFileDescriptorCallback.java

Add more JSDoc about ErrnoException

2017-05-12 15:40:47 +09:00

RecoverySystem.java

Revert disabling of eSIM wipes/retains.

2017-07-20 00:01:33 +00:00

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

…

RemoteCallbackList.java

Log excessive remote callbacks

2017-04-06 16:38:25 -07:00

RemoteException.java

…

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

RevocableFileDescriptor.java

Move PackageInstaller over to AppFuse.

2017-03-13 13:59:12 -06:00

Seccomp.java

Install seccomp into zygote not init

2017-02-02 17:45:11 +00:00

SELinux.java

…

ServiceManager.java

…

ServiceManagerNative.java

…

ServiceSpecificException.java

…

ShellCallback.java

…

ShellCommand.java

Adding "attach-agent" to ActivityManagerShellCommand

2017-02-16 13:19:41 -08:00

StatFs.java

Merge "Document the fact that StatFs.restat() and ctor can throw." am: 183c93f6a0 am: e11ed001dd

2017-04-05 21:14:46 +00:00

StrictMode.aidl

…

StrictMode.java

Disable activity leak detection by default for userdebug

2017-06-20 02:51:31 +00:00

SynchronousResultReceiver.java

…

SystemClock.java

…

SystemProperties.java

Frameworks: Clean up SystemProperties

2017-08-30 18:37:48 -07:00

SystemService.java

…

SystemVibrator.java

BZZZZZZT! BZZZZZT! New Vibrator APIs

2017-03-20 16:09:51 +00:00

TestLooperManager.java

Updates based on API council guidance.

2017-04-29 13:14:17 -06:00

TokenWatcher.java

…

Trace.java

Flag apps that have debugging set in systrace

2017-05-12 15:39:51 -07:00

TransactionTooLargeException.java

…

TransactionTracker.java

…

UEventObserver.java

…

UpdateEngine.java

Basic javadoc for android.os.UpdateEngine.

2017-02-28 15:19:32 -08:00

UpdateEngineCallback.java

Basic javadoc for android.os.UpdateEngine.

2017-02-28 15:19:32 -08:00

UpdateLock.java

…

UserHandle.aidl

…

UserHandle.java

Expose UserHandle.getIdentifier() to CTS.

2017-04-11 08:42:57 -07:00

UserManager.aidl

Make ENSURE_VERIFY_APPS global even when set by PO.

2017-01-16 18:29:01 +00:00

UserManager.java

Allow SMS and calling for demo users

2017-08-09 10:24:38 -07:00

UserManagerInternal.java

Purge Nonexistent User Jobs on Boot

2017-05-16 17:41:36 -07:00

VibrationEffect.aidl

BZZZZZZT! BZZZZZT! New Vibrator APIs

2017-03-20 16:09:51 +00:00

VibrationEffect.java

Add support for vibrator 1.1 HAL and TICK effect.

2017-06-02 15:48:49 +01:00

Vibrator.java

Annotate @SystemApi with required permissions.

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

VintfObject.java

android.os.VintfObject: add API for EDI.

2017-05-04 20:01:32 -07:00

VintfRuntimeInfo.java

Add android.os.VintfRuntimeInfo

2017-05-01 13:00:04 -07:00

WorkSource.aidl

…

WorkSource.java

Protobufferize PowerManager dumpsys

2017-02-23 15:19:11 -08:00

ZygoteProcess.java

resolve merge conflicts of e017dae587 to stage-aosp-master

2017-09-13 11:08:36 +01:00