Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3c57702ea1b060d668d32bf3f75ab1a4c7318c3a
frameworks_base/core/java/android/os
History
Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master 
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
2020-12-08 11:01:05 -07:00
..
connectivity
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
health
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
image
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
incremental
[incremental/pm] set health listener on commit and on reboot
2020-10-20 01:13:07 +00:00
storage
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
strictmode
Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag.
2020-11-18 23:23:50 +00:00
AppZygote.java
Merge QQ3A.200805.001
2020-08-05 17:40:02 +00:00
AsyncResult.java
…
AsyncTask.java
…
BadParcelableException.java
…
BaseBundle.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
BatteryConsumer.java
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -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
…
BatteryStats.java
Introduce MeasuredEnergyStats to BatteryStatsImpl
2020-11-20 14:59:36 -08:00
BatteryStatsManager.java
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -08:00
BatteryUsageStats.aidl
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -08:00
BatteryUsageStats.java
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -08:00
BestClock.java
…
Binder.java
Make restoreCallingIdentity() @CriticalNative.
2020-10-19 22:12:10 -06:00
BinderProxy.java
freezer: reentrant enable/disable method
2020-08-27 16:05:57 -07:00
Broadcaster.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
BugreportManager.java
Replace broadcast with adding a method in BugreportCallback
2020-11-14 12:11:34 +00:00
BugreportParams.java
Remove @TestApi from @SystemApi symbols
2020-10-20 09:04:03 +01:00
Build.java
Merge "Add VERSION_CODES constant for S" am: dfe33cb756
2020-12-07 14:48:36 +00:00
Bundle.aidl
…
Bundle.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
CancellationSignal.java
…
CarrierAssociatedAppEntry.aidl
Add new "addedInSdk" attribute to carrier-associated apps.
2020-06-16 16:48:38 -07:00
CarrierAssociatedAppEntry.java
Add new "addedInSdk" attribute to carrier-associated apps.
2020-06-16 16:48:38 -07:00
ChildZygoteProcess.java
…
CombinedVibrationEffect.aidl
Create CombinedVibrationEffect.aidl
2020-10-12 17:23:50 +00:00
CombinedVibrationEffect.java
Make CombinedVibrationEffect constructor package-private
2020-11-10 13:04:00 +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
Add SystemMemory pulled atom in statsd
2020-12-03 13:54:53 +00:00
DropBoxManager.aidl
…
DropBoxManager.java
Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310 am: 9bade16516 am: acbb11f541 am: 69194793fd
2020-07-31 17:09:57 +00:00
Environment.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +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
FileBridge: fix fd ownership mismanagement.
2020-09-21 14:47:56 -07:00
FileObserver.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
FileUriExposedException.java
…
FileUtils.java
Introduce new preference indicating user control.
2020-12-06 23:37:15 +00:00
GraphicsEnvironment.java
[GraphicsEnvironment] Remove unnecessary prefix.
2020-10-15 13:36:47 -07: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
mCallback defined in BringYourOwnSection should be an object instead of a reference.
2020-05-14 15:24:39 -07:00
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
INetworkActivityListener.aidl
…
INetworkManagementService.aidl
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
IPermissionController.aidl
…
IPowerManager.aidl
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
IProcessInfoService.aidl
…
IProgressListener.aidl
…
IRecoverySystem.aidl
…
IRecoverySystemProgressListener.aidl
…
IRemoteCallback.aidl
…
ISchedulingPolicyService.aidl
…
ISystemConfig.aidl
Add new "addedInSdk" attribute to carrier-associated apps.
2020-06-16 16:48:38 -07:00
ISystemUpdateManager.aidl
…
IThermalEventListener.aidl
…
IThermalService.aidl
…
IThermalStatusListener.aidl
…
IUpdateLock.aidl
…
IUserManager.aidl
Add removeUserOrSetEphemeral
2020-10-14 13:09:07 -07:00
IUserRestrictionsListener.aidl
…
IVibratorManagerService.aidl
Create CombinedVibrationEffect.aidl
2020-10-12 17:23:50 +00:00
IVibratorService.aidl
…
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
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
package.html
…
Parcel.java
Merge "IBinder: support FLAG_CLEAR_BUF" am: 9910d9980e am: dcae11d0ef am: 951299fb04 am: b908d8a2ee
2020-11-11 18:44:05 +00:00
Parcelable.java
Expose 'ParcelableHolder' as SystemApi
2020-10-20 11:59:45 +09:00
ParcelableException.aidl
…
ParcelableException.java
…
ParcelableHolder.java
Merge "Throw BadParcelableException from set/getParcelable"
2020-12-07 07:32:29 +00:00
ParcelableParcel.aidl
…
ParcelableParcel.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
ParcelDuration.aidl
Add battery discharge prediction APIs.
2020-08-18 11:34:33 -07:00
ParcelDuration.java
Add battery discharge prediction APIs.
2020-08-18 11:34:33 -07:00
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
…
PerformanceCollector.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
PersistableBundle.java
Mechanical refactoring to new XML resolvers.
2020-11-16 14:43:40 -07:00
PooledStringReader.java
…
PooledStringWriter.java
…
PowerComponents.java
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -08:00
PowerManager.java
Merge "Update comment for new proto directory" am: 777d7d838a am: 9f5b01e691 am: 1592b52b91
2020-12-02 15:25:42 +00:00
PowerManagerInternal.java
Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491 am: 69603f319e am: 64bff5c814
2020-08-07 10:13:28 +00:00
PowerSaveState.aidl
…
PowerSaveState.java
…
Process.java
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
2020-12-02 00:38:58 -08:00
ProxyFileDescriptorCallback.java
…
RecoverySystem.java
Remove legacy style metalava suppression
2020-11-12 18:30:12 -08:00
RedactingFileDescriptor.java
…
Registrant.java
Remove garbage spaces
2020-05-18 08:57:31 +00:00
RegistrantList.java
Add clearAll method to RegistrantList for easier cleanup
2020-05-26 14:45:13 -07:00
RemoteCallback.aidl
…
RemoteCallback.java
Remove @TestApi from @SystemApi symbols
2020-10-20 09:04:03 +01:00
RemoteCallbackList.java
…
RemoteException.java
…
RemoteMailException.java
…
ResultReceiver.aidl
…
ResultReceiver.java
…
RevocableFileDescriptor.java
…
SELinux.java
…
ServiceManager.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
ServiceManagerNative.java
ServiceManager: add getDeclaredInstances
2020-09-24 00:46:56 +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
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
StatsServiceManager.java
…
StrictMode.aidl
…
StrictMode.java
Release detectIncorrectContextUse
2020-11-19 13:45:33 +08:00
SynchronousResultReceiver.java
…
SystemClock.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
SystemConfigManager.java
Remove @TestApi from @SystemApi symbols
2020-10-20 09:04:03 +01: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
Remove deprecated VibrationAttributes.getAudioAttrs method
2020-10-01 16:32:19 +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
Add BugreportManagerTestCases to bugreport presubmit
2020-09-29 18:54:37 +01: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
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
TraceNameSupplier.java
…
TransactionTooLargeException.java
…
TransactionTracker.java
…
UEventObserver.java
…
UidBatteryConsumer.java
Introduce BatteryUsageStats API
2020-12-03 10:42:41 -08:00
UpdateEngine.java
Update language to comply with Android's inclusive language guidance
2020-09-14 10:00:02 -06:00
UpdateEngineCallback.java
…
UpdateLock.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
UserHandle.aidl
…
UserHandle.java
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
UserManager.aidl
…
UserManager.java
Generic Test profile on debuggable builds
2020-12-07 09:41:41 -08:00
Users.md
Clarify doc for users, clarifying profiles
2020-06-18 00:08:51 +00:00
VibrationAttributes.aidl
…
VibrationAttributes.java
Add @Nullable annotation to the parameter of Object.equals() methods.
2020-10-15 10:48:01 -07:00
VibrationEffect.aidl
…
VibrationEffect.java
Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee am: 8c54f99eba
2020-12-01 01:18:47 +00:00
Vibrator.java
Remove @TestApi from @SystemApi symbols
2020-10-20 09:04:03 +01: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 ab/6749736 in stage.
2020-10-10 20:38:57 -07:00