Lorenzo Colitti 8228eb3446 resolve merge conflicts of a1d67fb38e to stage-aosp-master ...

Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa

2017-07-19 07:35:31 +09:00

..

health

Annotate @SystemApi with required permissions.

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

storage

Improve developer docs for storage APIs.

2017-06-12 20:19:53 +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

Parcel/unparcel charge_full state from BatteryProperties

2016-12-09 19:28:21 -08:00

BatteryProperty.aidl

…

BatteryProperty.java

…

BatteryStats.java

Merge changes from topic 'battery_smear_move' into oc-dev

2017-06-09 20:50:47 +00: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

Respond to API council feedback.

2017-04-27 11:33:39 -06: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

CountDownTimer: not skip onTick()

2016-10-25 08:19:36 +00:00

CpuUsageInfo.aidl

…

CpuUsageInfo.java

…

DeadObjectException.java

…

DeadSystemException.java

…

Debug.aidl

Move ApplicationThread to aidl.

2016-10-19 11:29:47 -07:00

Debug.java

Add more details to dumpsys meminfo -d

2017-07-14 12:14:59 -07:00

DropBoxManager.aidl

Add a native class to interact with DropBoxManager.

2016-12-15 11:23:05 -08:00

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

DO NOT MERGE. Clarify FileObserver docs for null value.

2016-08-31 21:42:54 +00:00

FileUriExposedException.java

…

FileUtils.java

Register secondary dex files for JIT profiling

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

GraphicsEnvironment.java

Require targetSdkVersion>=O for updated graphics driver packages

2017-05-15 14:08:57 -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 configureRpcThreadpool to java interface

2017-07-12 17:56:39 -07:00

HwBlob.java

Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)

2016-09-27 11:20:44 -07:00

HwParcel.java

Validate incoming data properly.

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

HwRemoteBinder.java

Add checked exceptions to HwBinder transact.

2017-01-04 01:13:16 +00:00

IBatteryPropertiesListener.aidl

…

IBatteryPropertiesRegistrar.aidl

Update IBatteryPropertiesRegistrar.aidl to support force updates

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

IBinder.java

New infrastructure to switch remaining commands to "cmd" calls.

2016-09-29 10:58:44 -07:00

ICancellationSignal.aidl

…

IDeviceIdentifiersPolicyService.aidl

Move device serial behing a permission

2016-09-11 18:44:38 +00:00

IDeviceIdleController.aidl

…

IHardwarePropertiesManager.aidl

…

IHwBinder.java

HwBinder: get/register checked exceptions.

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

IHwInterface.java

Initial commit of Java support for hardware binder

2016-09-07 15:10:30 +02:00

IIncidentManager.aidl

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

IIncidentReportCompletedListener.aidl

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

IIncidentReportStatusListener.aidl

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

IInterface.java

…

IMaintenanceActivityListener.aidl

…

IMessenger.aidl

…

IncidentManager.java

Annotate @SystemApi with required permissions.

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

IncidentReportArgs.aidl

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

IncidentReportArgs.java

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

INetworkActivityListener.aidl

…

INetworkManagementService.aidl

Allow more than one source of tethering statistics.

2017-07-19 00:54:54 +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."

2017-07-11 11:10:23 +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

Merge "Documentation: changed tid parameter description for getThreadPriority()" am: 663b02dd28

2017-06-19 11:54:05 +00:00

ProxyFileDescriptorCallback.java

Add more JSDoc about ErrnoException

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

RecoverySystem.java

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

2017-06-05 22:28:21 +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

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

ServiceManagerNative.java

…

ServiceSpecificException.java

Catch all exceptions from installd, log codes.

2016-12-12 10:16:32 -07:00

ShellCallback.java

New infrastructure to switch remaining commands to "cmd" calls.

2016-09-29 10:58:44 -07:00

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

Move IActivityManager to aidl.

2016-11-04 10:43:25 -07:00

StrictMode.java

Disable activity leak detection by default for userdebug

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

SynchronousResultReceiver.java

…

SystemClock.java

SystemClock JNI update

2016-10-03 16:03:31 -07:00

SystemProperties.java

Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416 am: 40c4210f8f

2017-03-16 05:50:23 +00: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

Merge "Add trace category for adb." am: 6968d90dc5 am: 15dc5951e6 am: 96446b5bd3

2016-12-13 01:10:22 +00:00

TransactionTooLargeException.java

…

TransactionTracker.java

Add traces to systrace when binder tracing is enabled

2016-11-02 16:10:14 -07:00

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

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06: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

Also log the value of the IAEs thrown in VibrationEffect

2017-05-03 15:05:46 +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

Support loading a stub WebView using a donor package.

2017-03-28 16:21:10 +00:00