Zimuzo Ezeozue 4005dd8a79 resolve merge conflicts of 7df4e1c5a4 ...

resolve merge conflicts of
"Add API to notify the system_server when app is blocked on I/O"
to master

Change-Id: Ie7a7be2a5b8557a2cdd3fbc1a6a37622b29535be

2021-03-01 15:55:14 +00:00

..

connectivity

Move NUM_GPS_SIGNAL_QUALITY_LEVELS to GnssSignalQuality

2020-12-15 21:29:08 +00:00

health

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

image

Merge "Fix DynamicSystemClient.start() exceptions"

2021-01-13 02:35:28 +00:00

incremental

API feedback: getVersion instead of isV2.

2021-02-25 02:06:08 +00:00

storage

resolve merge conflicts of 7df4e1c5a4

2021-03-01 15:55:14 +00:00

strictmode

Unhide isUiContext()

2021-02-22 08:38:52 +00:00

AppZygote.java

…

AsyncResult.java

…

AsyncTask.java

…

BadParcelableException.java

…

BaseBundle.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

BatteryConsumer.java

Convert WifiPowerCalculator to work with BatteryUsageStats

2021-02-22 11:35:14 -08:00

BatteryManager.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

BatteryManagerInternal.java

…

BatteryProperty.aidl

…

BatteryProperty.java

…

BatterySaverPolicyConfig.aidl

…

BatterySaverPolicyConfig.java

add full battery saver runtime modification API

2021-01-25 09:43:51 -08:00

BatteryStats.java

Remove support for OLD_HISTORY

2021-02-26 23:14:04 +00:00

BatteryStatsManager.java

Change the API for getting PowerProfile-only BatteryUsageStats

2021-02-03 20:27:47 +00:00

BatteryUsageStats.aidl

Introduce BatteryUsageStats API

2020-12-03 10:42:41 -08:00

BatteryUsageStats.java

Add battery history to BatteryStatsUsage

2021-02-28 17:05:39 -08:00

BatteryUsageStatsQuery.aidl

Add "modeled" power components

2020-12-16 13:07:04 -08:00

BatteryUsageStatsQuery.java

Add battery history to BatteryStatsUsage

2021-02-28 17:05:39 -08:00

BestClock.java

…

Binder.java

Remove redundant method Binder.getNativeTid()

2021-01-26 19:08:36 +00:00

BinderProxy.java

Dump binder proxies interface descriptors on a separate thread.

2021-02-05 14:00:46 +01:00

Broadcaster.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

BugreportManager.java

[API review] Additional detail in BugreportCallback javadoc.

2021-02-25 23:16:20 +00:00

BugreportParams.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

Build.java

Merge "Rename Build.IS_CONTAINER to IS_ARC"

2021-02-26 00:16:28 +00:00

Bundle.aidl

…

Bundle.java

Add javadoc for (Persistable)Bundle.EMPTY

2021-01-28 11:20:04 +00:00

CancellationSignal.java

…

CarrierAssociatedAppEntry.aidl

…

CarrierAssociatedAppEntry.java

…

ChildZygoteProcess.java

…

CombinedVibrationEffect.aidl

Create CombinedVibrationEffect.aidl

2020-10-12 17:23:50 +00:00

CombinedVibrationEffect.java

Introduce SystemVibratorManager

2021-02-11 09:26:21 +00:00

ConditionVariable.java

…

ConfigUpdate.java

…

CoolingDevice.aidl

…

CoolingDevice.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

CountDownTimer.java

…

CpuUsageInfo.aidl

…

CpuUsageInfo.java

…

DeadObjectException.java

…

DeadSystemException.java

…

Debug.aidl

…

Debug.java

dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework

2021-02-12 10:08:23 -08:00

DropBoxManager.aidl

…

DropBoxManager.java

Interface to dynamically generate DropBox data.

2021-01-12 13:51:28 -07:00

Environment.java

Merge "Make OP_NO_ISOLATED_STORAGE accessible via public API" into sc-dev

2021-02-10 19:53:44 +00:00

EventLogTags.logtags

…

ExternalVibration.aidl

…

ExternalVibration.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

FactoryTest.java

…

FileBridge.java

Make a copy of libcore.util.ArraysUtils in framework

2020-12-17 00:07:23 +00:00

FileObserver.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

FileUriExposedException.java

…

FileUtils.java

Fix convertToModernFd to support /mnt/user paths

2021-01-19 08:48:09 +00:00

GraphicsEnvironment.java

Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev am: 23ace73ac4

2020-12-15 19:10:01 +00:00

Handler.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

HandlerExecutor.java

…

HandlerThread.java

…

HardwarePropertiesManager.java

…

HidlMemory.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

HidlMemoryUtil.java

…

HidlSupport.java

…

HwBinder.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

HwBlob.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

HwParcel.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

HwRemoteBinder.java

…

IBatteryPropertiesRegistrar.aidl

…

IBinder.java

Merge "IBinder: support FLAG_CLEAR_BUF"

2020-11-11 16:17:20 +00:00

ICancellationSignal.aidl

…

IDeviceIdentifiersPolicyService.aidl

…

IExternalVibrationController.aidl

…

IExternalVibratorService.aidl

…

IHardwarePropertiesManager.aidl

…

IHwBinder.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

IHwInterface.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

IIncidentDumpCallback.aidl

…

IIncidentManager.aidl

…

IIncidentReportStatusListener.aidl

…

IInterface.java

…

IMessenger.aidl

…

IncidentManager.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

IncidentReportArgs.aidl

…

IncidentReportArgs.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

INetworkManagementService.aidl

[IT05] Remove the unused network activity logic out from NMS

2021-02-18 12:02:02 +08:00

IPermissionController.aidl

…

IPowerManager.aidl

add full battery saver runtime modification API

2021-01-25 09:43:51 -08:00

IProcessInfoService.aidl

…

IProgressListener.aidl

…

IRecoverySystem.aidl

Deprecate the old rebootAndApply API

2020-12-17 13:05:36 -08:00

IRecoverySystemProgressListener.aidl

…

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

…

ISystemConfig.aidl

New API for getting uids have specific permissions from SystemConfig

2021-02-09 10:11:41 +08:00

ISystemUpdateManager.aidl

…

IThermalEventListener.aidl

…

IThermalService.aidl

…

IThermalStatusListener.aidl

…

IUpdateLock.aidl

…

IUserManager.aidl

Minor adjustements on UserManager.isUserForeground().

2021-02-25 17:58:14 -08:00

IUserRestrictionsListener.aidl

…

IVibratorManagerService.aidl

Implement vibrate and cancelVibrate on VibratorManagerService

2021-02-02 14:14:13 +00:00

IVibratorStateListener.aidl

…

LimitExceededException.java

…

LocaleList.aidl

…

LocaleList.java

Merge "Add maxTargetSdk restriction to unused APIs."

2020-11-09 14:41:20 +00:00

Looper.java

Docs: update the example code in Looper

2020-10-24 22:16:14 -07:00

MemoryFile.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Message.aidl

…

Message.java

…

MessageQueue.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Messenger.aidl

…

Messenger.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

NativeHandle.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

NetworkOnMainThreadException.java

…

NullVibrator.java

Remove deprecated VibrationAttributes.getAudioAttrs method

2020-10-01 16:32:19 +00:00

OperationCanceledException.java

…

OutcomeReceiver.java

Expose requestModemActivityInfo

2020-10-20 17:51:22 -07:00

OWNERS

Clean up after VibratorManager feature introduced

2021-02-12 14:45:58 +00:00

package.html

…

Parcel.java

Merge "binder: race condition by parcel finalize" am: 52f933552a am: 5cb323c59e am: 2795e91f14

2021-02-03 21:56:04 +00:00

Parcelable.java

Expose 'ParcelableHolder' as SystemApi

2020-10-20 11:59:45 +09:00

ParcelableException.aidl

…

ParcelableException.java

…

ParcelableHolder.java

Merge "Add some comments about thread-safety"

2020-12-29 16:03:08 +00:00

ParcelableParcel.aidl

…

ParcelableParcel.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ParcelDuration.aidl

…

ParcelDuration.java

…

ParcelFileDescriptor.java

…

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

PatternMatcher.aidl

…

PatternMatcher.java

Add support for pathSuffix

2021-01-12 16:15:52 -08:00

PerformanceCollector.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

PersistableBundle.java

Add javadoc for (Persistable)Bundle.EMPTY

2021-01-28 11:20:04 +00:00

PooledStringReader.java

…

PooledStringWriter.java

…

PowerComponents.java

Add discharge power estimates to BatteryUsageStats

2021-02-18 16:47:42 -08:00

PowerManager.java

Merge "Remove unnecessary permission check." into sc-dev

2021-02-22 16:55:01 +00:00

PowerManagerInternal.java

…

PowerSaveState.aidl

…

PowerSaveState.java

add SoundTrigger service modes in battery saver

2021-01-22 18:24:39 -08:00

Process.java

Adds caller check to getAllPackages()

2021-02-18 18:15:21 +00:00

ProxyFileDescriptorCallback.java

…

RecoverySystem.java

Merge "Throw an exception in RoR api on no-pin case"

2021-02-22 20:42:35 +00:00

RedactingFileDescriptor.java

…

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

RemoteCallbackList.java

…

RemoteException.java

API for CDM wake-up opt-in

2020-12-10 18:57:17 -08:00

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

RevocableFileDescriptor.java

…

SELinux.java

…

ServiceManager.java

WatchDog: support dumping AIDL HALs

2021-01-28 22:53:23 +00:00

ServiceManagerNative.java

WatchDog: support dumping AIDL HALs

2021-01-28 22:53:23 +00:00

ServiceSpecificException.java

…

SharedMemory.aidl

…

SharedMemory.java

Add trackingBug to SharedMemory.getFd()

2020-10-29 15:52:51 +00:00

ShellCallback.java

…

ShellCommand.java

Move BasicShellCommandHandler to frameworks/lib/modules-utils

2020-11-19 03:16:03 +00:00

SimpleClock.java

…

StatFs.java

Don't suggest now-deprecated APIs

2020-12-10 22:53:07 +00:00

StatsServiceManager.java

…

StrictMode.aidl

…

StrictMode.java

docs: Can leave StrictMode enabled in prod

2021-02-06 02:47:45 +00:00

SynchronousResultReceiver.java

…

SystemBatteryConsumer.java

Copy custom measured power to BatteryUsageStats

2021-02-20 13:38:48 -08:00

SystemClock.java

Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 am: 08f03dc59c

2021-03-01 08:08:35 +00:00

SystemConfigManager.java

New API for getting uids have specific permissions from SystemConfig

2021-02-09 10:11:41 +08:00

SystemProperties.java

Derestrict PROP_NAME_MAX.

2020-11-09 16:32:33 +00:00

SystemService.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

SystemUpdateManager.java

…

SystemVibrator.java

Introduce SystemVibratorManager

2021-02-11 09:26:21 +00:00

SystemVibratorManager.java

Introduce SystemVibratorManager

2021-02-11 09:26:21 +00:00

TelephonyServiceManager.java

…

Temperature.aidl

…

Temperature.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

TEST_MAPPING

TEST_MAPPING for BatteryStats

2021-02-25 14:51:01 -08:00

TestLooperManager.java

…

ThreadLocalWorkSource.java

…

TimestampedValue.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

TokenWatcher.java

…

Trace.java

Do not check for debuggable / profilable for app tracing.

2021-02-12 20:27:59 +00:00

TraceNameSupplier.java

…

TransactionTooLargeException.java

TransactionTooLargeException: doc clarification

2020-12-30 19:46:57 +00:00

TransactionTracker.java

…

UEventObserver.java

…

UidBatteryConsumer.java

Add UID time-in-state to UidBatteryConsumer

2021-02-25 15:47:20 -08:00

UpdateEngine.java

…

UpdateEngineCallback.java

…

UpdateLock.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

UserBatteryConsumer.java

Convert UserPowerCalculator to work with BatteryUsageStats

2021-02-09 12:57:15 -08:00

UserHandle.aidl

…

UserHandle.java

Merge ab/7061308 into stage.

2021-02-21 09:39:53 -08:00

UserManager.aidl

…

UserManager.java

Merge "Minor adjustements on UserManager.isUserForeground()." into sc-dev

2021-03-01 03:52:48 +00:00

Users.md

…

VibrationAttributes.aidl

…

VibrationAttributes.java

Implement dump and vibrate cmds for Vibrator Manager

2021-02-02 16:00:12 +00:00

VibrationEffect.aidl

…

VibrationEffect.java

Constrain scaled amplitude to valid values in [1,255]

2021-02-22 01:08:18 +00:00

Vibrator.java

Fix Vibrator and VibratorManager public API docs

2021-02-23 17:23:18 +00:00

VibratorInfo.aidl

Create parcelable VibratorInfo to expose HAL profile

2020-12-04 16:26:02 +00:00

VibratorInfo.java

Create parcelable VibratorInfo to expose HAL profile

2020-12-04 16:26:02 +00:00

VibratorManager.java

Fix Vibrator and VibratorManager public API docs

2021-02-23 17:23:18 +00:00

VintfObject.java

…

VintfRuntimeInfo.java

…

WorkSource.aidl

…

WorkSource.java

Fix hopefully minor bug in WorkSource.add

2020-11-05 14:53:45 -08:00

ZygoteProcess.java

Merge "Add zygote native fork loop" am: 43a9a8089f am: dd81ed70c7 am: 925ecc3f80

2021-02-26 17:20:42 +00:00