Martijn Coenen 1d336da880 resolve merge conflicts of 80894b6063 to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c36f66c4bf9129c1b421290f82bdae83be6979e
Merged-In: If9dd6913868a34ea1e3d14fee1860a4ff368e06b

2018-07-24 20:04:57 +02:00

..

connectivity

Obtain cellular related battery statistics

2018-03-02 20:06:18 +00:00

health

Annotate @SystemApi with required permissions.

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

storage

Merge "Check for null path in getInternalPathForUser"

2018-06-08 16:55:43 -07:00

strictmode

resolve merge conflicts of c8f5480981 to pi-dev-plus-aosp

2018-04-05 15:43:51 +01: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 PersistableBundle C++ -> Java interop

2018-04-26 16:35:38 -07:00

BatteryManager.java

Add API to compute charge time remaining.

2018-04-11 23:47:31 +01:00

BatteryManagerInternal.java

Keep track of battery drain rate in various states...

2018-01-29 11:09:14 -08:00

BatteryProperty.aidl

…

BatteryProperty.java

BatteryService serves IBatteryPropertiesRegistrar.

2017-10-18 12:35:10 -07:00

BatteryStats.java

Bumping BatteryStats report version.

2018-05-22 15:02:50 -07:00

BatteryStatsInternal.java

Log deferred jobs metrics to batterystats

2018-02-18 22:43:13 -08:00

BestClock.java

Better handling of NTP-based clocks.

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

Binder.java

resolve merge conflicts of 80894b6063 to stage-aosp-master

2018-07-24 20:04:57 +02:00

BinderProxy.java

resolve merge conflicts of 80894b6063 to stage-aosp-master

2018-07-24 20:04:57 +02:00

Broadcaster.java

…

Build.java

Finalizing P SDK

2018-04-13 14:18:27 -07:00

Bundle.aidl

…

Bundle.java

incidentd: dumping jobscheduler to proto

2018-01-09 12:05:39 -08:00

CancellationSignal.java

…

ChildZygoteProcess.java

Add Zygote.startChildZygote() to fork a new process that itself is a zygote.

2018-02-16 14:17:41 -05:00

ConditionVariable.java

…

ConfigUpdate.java

add javadoc for carrier ifd install API

2018-05-17 15:03:00 -07:00

CountDownTimer.java

…

CpuUsageInfo.aidl

…

CpuUsageInfo.java

…

DeadObjectException.java

…

DeadSystemException.java

…

Debug.aidl

…

Debug.java

Merge "Reduce pss collection amount, improve logging."

2018-01-29 16:52:08 +00:00

DeviceIdleManager.java

Expose TestAPIs needed by GtsOsTestCases

2018-04-06 14:59:07 -07:00

DropBoxManager.aidl

…

DropBoxManager.java

Annotate @SystemApi with required permissions.

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

Environment.java

Expose TestAPIs needed by GtsOsTestCases

2018-04-06 14:59:07 -07:00

EventLogTags.logtags

Add stats logging to ServiceManager and NPMS

2018-04-11 16:37:57 -07:00

FactoryTest.java

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

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

FileBridge.java

Stop using Arrays.checkOffsetAndCount.

2018-05-10 18:17:50 +01:00

FileObserver.java

…

FileUriExposedException.java

…

FileUtils.java

Report final progress when finished copying.

2018-03-26 16:54:38 -06:00

GraphicsEnvironment.java

Rootless GPU Debug

2017-11-16 22:58:45 -07:00

Handler.java

Add factory methods for async Handlers

2018-03-19 15:54:13 +00:00

HandlerExecutor.java

Start accepting Executors instead of Handlers.

2017-12-13 13:59:04 -07:00

HandlerThread.java

Register PackageMonitor for CompanionDeviceManagerService

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

HardwarePropertiesManager.java

Atom: TemperatureReported

2018-02-26 20:55:26 -08:00

HidlSupport.java

Add remaining missing HIDL SystemApi methods.

2018-03-29 15:04:14 -07:00

HwBinder.java

HIDL: add APIs used by subclasses to SystemApi

2018-03-29 15:04:27 -07:00

HwBlob.java

Allow HIDL to be used in priv-apps.

2018-03-29 15:03:59 -07:00

HwParcel.java

Allow HIDL to be used in priv-apps.

2018-03-29 15:03:59 -07:00

HwRemoteBinder.java

Allow equality checking and hash for HIDL interface proxies.

2017-11-01 18:30:04 -07:00

IBatteryPropertiesRegistrar.aidl

IBatteryPropertiesRegistrar: remove unused functions

2018-07-17 15:35:49 -07:00

IBinder.java

Fix issue #64224738: Document return value of IBinder.transact()

2017-10-25 14:21:32 -07:00

ICancellationSignal.aidl

…

IDeviceIdentifiersPolicyService.aidl

…

IDeviceIdleController.aidl

Added apis for changing the system whitelist

2017-09-28 18:04:27 -07:00

IHardwarePropertiesManager.aidl

…

IHwBinder.java

Update HIDL-related documentation.

2018-03-29 15:04:20 -07:00

IHwInterface.java

Update HIDL-related documentation.

2018-03-29 15:04:20 -07:00

IIncidentManager.aidl

Remove IIncidentReportCompleted and gmscore WW module would

2017-12-15 15:35:34 -08:00

IIncidentReportStatusListener.aidl

…

IInterface.java

…

IMaintenanceActivityListener.aidl

…

IMessenger.aidl

…

IncidentManager.java

Removing the settings-based IncidentReportArgs method.

2018-03-16 18:15:46 -07:00

IncidentReportArgs.aidl

…

IncidentReportArgs.java

Removing the settings-based IncidentReportArgs method.

2018-03-16 18:15:46 -07:00

INetworkActivityListener.aidl

…

INetworkManagementService.aidl

Add method to NetworkStatsService for UID stats.

2018-03-30 18:58:18 +09:00

IPermissionController.aidl

Protect usage data with OP_GET_USAGE_STATS.

2018-04-16 12:44:32 -06:00

IPowerManager.aidl

Screen off animation

2018-03-20 15:59:51 -07:00

IProcessInfoService.aidl

…

IProgressListener.aidl

…

IRecoverySystem.aidl

…

IRecoverySystemProgressListener.aidl

…

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

Adjust media.codec process group upon request from mediaserver

2018-04-18 13:23:24 -07:00

IServiceManager.java

Add DEFAULT dump priority for services

2018-02-05 13:04:55 -08:00

IStatsCompanionService.aidl

Adds a code when statsd sends intent to getData.

2018-04-13 17:01:13 -07:00

IStatsManager.aidl

Re-enable the logging of APP_BREADCRUMB_REPORTED atom

2018-05-06 22:25:05 -07:00

ISystemUpdateManager.aidl

Add pending system update info system APIs.

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

IThermalEventListener.aidl

thermalservice: Add ThermalService java interfaces

2017-08-07 23:08:36 +00:00

IThermalService.aidl

thermalservice: Add ThermalService java interfaces

2017-08-07 23:08:36 +00:00

IUpdateLock.aidl

…

IUserManager.aidl

Adding hidden APIs for assigning Admin flag to users.

2018-05-23 00:08:05 +00:00

IVibratorService.aidl

BZZZZZZT! BZZZZZT! New Vibrator APIs

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

LocaleList.aidl

…

LocaleList.java

Implement issue #73301635: Ability to extract device configuration

2018-02-23 15:30:04 -08:00

Looper.java

Log slow message delivery on Looper

2018-04-27 17:15:46 -07:00

MemoryFile.java

SharedMemory API changes

2017-08-07 15:36:10 -07:00

Message.aidl

…

Message.java

PooledLambda

2017-12-05 10:46:59 -08:00

MessageQueue.java

MessageQueue: explicitly remove FD event listeners.

2018-04-03 21:20:47 +00: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 changes from topic "bionic_fdsan_java"

2018-07-20 21:14:33 -07:00

Parcelable.java

Even more auto-doc work.

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

ParcelableException.java

Only construct real Throwable objects.

2017-09-20 23:39:20 +00:00

ParcelableParcel.aidl

…

ParcelableParcel.java

…

ParcelFileDescriptor.aidl

Use ParcelFileDescriptor's C++ implementation in libbinder

2018-05-30 17:57:34 +09:00

ParcelFileDescriptor.java

ParcelFileDescriptor: support bionic's fd ownership tracking.

2018-07-20 16:00:20 -07:00

ParcelFormatException.java

…

ParcelUuid.aidl

Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)

2017-11-09 19:40:03 +00:00

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

Implement Activity Manager Broadcasts dump protos

2017-10-11 18:35:14 -07:00

PerformanceCollector.java

…

PersistableBundle.java

incidentd: dumping jobscheduler to proto

2018-01-09 12:05:39 -08:00

PooledStringReader.java

…

PooledStringWriter.java

…

PowerManager.java

Fixed power manager CTS test.

2018-04-16 18:50:10 +01:00

PowerManagerInternal.java

Avoid changing display power state on draw wake lock

2018-03-07 18:02:55 +00:00

PowerSaveState.aidl

Add BatterySaverPolicy for power save mode

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

PowerSaveState.java

Make the battery saver knobs hidden public,

2017-11-01 14:49:10 -07:00

Process.java

Merge "ActivityManagerService: add restricted cpuset" into pi-dev

2018-04-18 16:59:26 -07:00

ProxyFileDescriptorCallback.java

Add more JSDoc about ErrnoException

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

RecoverySystem.java

Remove all the implementation for keep eSIM profile during FDR

2018-01-22 12:25:34 -08:00

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

Make RemoteCallback test API

2018-05-21 15:55:28 +00:00

RemoteCallbackList.java

Communicate relevantEvents=0 for packages excluded from whitelist

2017-12-20 10:41:12 -08:00

RemoteException.java

Provide remote stack trace information

2017-11-14 14:31:32 -08:00

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

RevocableFileDescriptor.java

Move PackageInstaller over to AppFuse.

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

SELinux.java

…

ServiceManager.java

Add stats logging to ServiceManager and NPMS

2018-04-11 16:37:57 -07:00

ServiceManagerNative.java

Pass dumpsys priority to IServiceManager

2017-09-25 10:25:26 -07:00

ServiceSpecificException.java

…

SharedMemory.aidl

Add SharedMemory API

2017-06-28 16:49:12 -07:00

SharedMemory.java

SharedMemory API changes

2017-08-07 15:36:10 -07:00

ShellCallback.java

The pm command is no more.

2017-11-21 10:17:14 -08:00

ShellCommand.java

The pm command is no more.

2017-11-21 10:17:14 -08:00

SimpleClock.java

Better handling of NTP-based clocks.

2018-02-16 22:11:35 +00: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

StatsDimensionsValue.aidl

Statsd broadcast subscriber

2018-01-24 13:08:19 -08:00

StatsDimensionsValue.java

Statsd broadcast subscriber

2018-01-24 13:08:19 -08:00

StatsLogEventWrapper.aidl

Changes pulled data to use Parcel objects.

2017-10-20 16:29:59 -07:00

StatsLogEventWrapper.java

Add timestamp for events pulled by companision service.

2018-02-23 10:56:03 -08:00

StrictMode.aidl

…

StrictMode.java

Merge "StrictMode: fix non-SDK API usage detection." into pi-dev

2018-04-20 01:20:19 -07:00

SynchronousResultReceiver.java

BatteryStats: Cleanup external stats collection

2017-06-09 15:23:04 -07:00

SystemClock.java

API council requested tweaks to SystemClock.

2018-03-26 15:34:24 -06:00

SystemProperties.java

Expose TestAPIs needed by GtsOsTestCases

2018-04-06 14:59:07 -07:00

SystemService.java

…

SystemUpdateManager.java

Add pending system update info system APIs.

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

SystemVibrator.java

BZZZZZZT! BZZZZZT! New Vibrator APIs

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

Temperature.aidl

thermalservice: Add ThermalService java interfaces

2017-08-07 23:08:36 +00:00

Temperature.java

thermalservice: future-proofing fixup to Temperature constructor

2017-08-16 08:01:12 +00:00

TestLooperManager.java

Updates based on API council guidance.

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

TokenWatcher.java

TokenWatcher: fix bug in repeated calls to acquire().

2017-11-01 09:43:14 +00:00

Trace.java

Merge "Systrace support for NNAPI" am: ecb0302ae9

2018-04-26 11:24:39 -07:00

TransactionTooLargeException.java

…

TransactionTracker.java

…

UEventObserver.java

WM: Add PhoneWindowManagerLayoutTest

2017-11-28 14:11:09 +01:00

UpdateEngine.java

Expose an update_engine API that verifies the given payload metadata.

2018-02-09 11:12:56 -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 TestAPIs needed by GtsOsTestCases

2018-04-06 14:59:07 -07:00

UserManager.aidl

…

UserManager.java

Adding hidden APIs for assigning Admin flag to users.

2018-05-23 00:08:05 +00:00

UserManagerInternal.java

Block adb from changing certain settings value when corresponding user

2018-03-07 11:04:34 +00:00

VibrationEffect.aidl

BZZZZZZT! BZZZZZT! New Vibrator APIs

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

VibrationEffect.java

Uncanonicalize URIs before comparing them.

2018-05-22 18:43:48 +00:00

Vibrator.java

Allow for any default vibration intensity level.

2018-05-30 00:21:38 +01:00

VintfObject.java

Merge "VintfObject: add getTargetFcmVersion"

2018-02-08 20:12:02 +00:00

VintfRuntimeInfo.java

Add android.os.VintfRuntimeInfo

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

WorkSource.aidl

…

WorkSource.java

Trim the invalid uids and tags when reading uids/tags from chain.

2018-04-09 14:45:28 -07:00

ZygoteProcess.java

Merge "Framework: Add API to get zygote PID" am: 1109e2333f

2018-05-24 13:49:41 -07:00