Colin Cross 41bf778441 resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp ...

am: 4bf50e486f

* commit '4bf50e486f85d7a9630ded3e36216710c9d1f97d':
  Add dumpsys meminfo --unreachable

2016-02-19 06:32:06 +00:00

..

storage

Fixed typo on Storage Access Framework.

2016-02-17 14:45:52 -08:00

AsyncResult.java

…

AsyncTask.java

Tweak AsyncTask#THREAD_POOL_EXECUTOR settings

2015-11-30 16:39:09 -08:00

BadParcelableException.java

…

BaseBundle.java

Implement transient extras for jobs.

2016-02-11 11:28:48 -08:00

BatteryManager.java

BatteryService: Add Max charging voltage

2015-11-16 10:43:52 -08:00

BatteryManagerInternal.java

…

BatteryProperties.aidl

…

BatteryProperties.java

BatteryService: Add Max charging voltage

2015-11-16 10:43:52 -08:00

BatteryProperty.aidl

…

BatteryProperty.java

…

BatteryStats.java

Track BLE scans in BatteryStats

2016-02-01 16:51:10 -08:00

Binder.java

Some small binder shell command improvements.

2016-01-28 15:20:48 -08:00

Broadcaster.java

…

Build.java

Add optional permission review for legacy apps - framework

2015-12-02 04:23:02 +00:00

Bundle.aidl

…

Bundle.java

Implement transient extras for jobs.

2016-02-11 11:28:48 -08:00

CancellationSignal.java

…

CommonClock.java

…

CommonTimeConfig.java

…

CommonTimeUtils.java

…

ConditionVariable.java

…

CountDownTimer.java

…

CpuUsageInfo.java

HardwarePropertiesManager: Add API for hardware properties retrieval

2016-01-22 17:33:37 +01:00

DeadObjectException.java

Don't crash in JNI: add DeadObjectException(String msg) ctor

2015-06-29 16:04:57 -07:00

Debug.java

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

DropBoxManager.aidl

…

DropBoxManager.java

DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.

2015-06-04 21:37:50 +00:00

Environment.java

Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev

2016-02-17 22:42:40 +00:00

FactoryTest.java

…

FileBridge.java

…

FileObserver.java

…

FileUriExposedException.java

Exposing file:// beyond your app is bad, m'kay?

2016-01-28 19:20:12 -07:00

FileUtils.java

Push mapping of package name to appId to kernel.

2016-02-18 15:01:15 -07:00

Handler.java

…

HandlerThread.java

…

HardwarePropertiesManager.java

HardwarePropertiesManager: Add API for hardware properties retrieval

2016-01-22 17:33:37 +01:00

IBatteryPropertiesListener.aidl

…

IBatteryPropertiesRegistrar.aidl

…

IBinder.java

Add new "shell command" feature to Binder objects.

2015-10-12 10:38:41 -07:00

ICancellationSignal.aidl

…

IDeviceIdleController.aidl

Add separate information about user whitelist.

2016-02-11 16:23:04 -08:00

IInterface.java

…

IMaintenanceActivityListener.aidl

Changes in DeviceIdlecontroller and JobScheduler to support Auto GarageMode.

2016-01-15 12:06:30 -08:00

IMessenger.aidl

…

INetworkActivityListener.aidl

…

INetworkManagementService.aidl

Fix NOT_RESTRICTED network capability and enforce it.

2015-08-04 07:24:24 -04:00

IPermissionController.aidl

Add body sensors app op - framework base

2015-05-01 13:56:04 -07:00

IPowerManager.aidl

Initial implementation of light-weight idle mode.

2015-10-20 10:43:14 -07:00

IProcessInfoService.aidl

AMS: add API to IProcessInfoServive for retrieving oom scores

2015-12-01 17:21:24 -08:00

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

…

IServiceManager.java

…

IUpdateLock.aidl

…

IUserManager.aidl

User creation with an intent

2016-01-15 17:06:35 -08:00

IVibratorService.aidl

…

Looper.java

…

MemoryFile.java

…

Message.aidl

…

Message.java

…

MessageQueue.java

Rename file descriptor listener API.

2015-05-15 12:28:15 -07:00

Messenger.aidl

…

Messenger.java

…

NetworkOnMainThreadException.java

…

NullVibrator.java

Make the NullVibrator really null.

2015-07-30 15:49:50 +01:00

OperationCanceledException.java

…

package.html

…

Parcel.java

Add comments to keep Java and native binder PersistableBundle in sync

2015-12-15 15:22:52 -08:00

Parcelable.java

Improve docs for Parcelable.describeContents()

2015-12-02 16:30:15 -08:00

ParcelableParcel.aidl

…

ParcelableParcel.java

Fix security issues when using Parcel.setDataPosition() with untrusted input

2015-10-01 20:48:23 +00:00

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

Unmount appfuse when the device FD is closed.

2015-12-22 13:41:33 +09:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

…

PerformanceCollector.java

…

PersistableBundle.java

Implement transient extras for jobs.

2016-02-11 11:28:48 -08:00

PooledStringReader.java

Fix issue #22328792: Fix scalability issues in AssistStructure

2015-07-09 14:06:47 -07:00

PooledStringWriter.java

Fix issue #22328792: Fix scalability issues in AssistStructure

2015-07-09 14:06:47 -07:00

PowerManager.java

PowerManager: Adds the Sustained performance API.

2016-01-27 13:15:30 -08:00

PowerManagerInternal.java

Initial implementation of light-weight idle mode.

2015-10-20 10:43:14 -07:00

Process.java

Expose APIs to analyze UIDs in UserHandle/Process.

2016-02-10 15:20:33 -08:00

RecoverySystem.java

Condionally remove the block map file.

2016-02-01 16:15:31 -08:00

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

Add optional permission review for legacy apps - framework

2015-12-02 04:23:02 +00:00

RemoteCallbackList.java

Add system API to watch for permission changes

2015-06-10 21:24:13 -07:00

RemoteException.java

…

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

SELinux.java

…

ServiceManager.java

[1/3] Remove unnecessary throws statement in ServiceManager

2016-01-07 15:08:27 +05:30

ServiceManagerNative.java

…

ServiceSpecificException.java

Rethrow remote's ServiceSpecificException

2015-12-04 16:06:08 -08:00

ShellCommand.java

Infrastructure for animating of maximizing pip activity.

2016-02-04 09:01:05 -08:00

StatFs.java

…

StrictMode.java

Exposing file:// beyond your app is bad, m'kay?

2016-01-28 19:20:12 -07:00

SystemClock.java

…

SystemProperties.java

…

SystemService.java

…

SystemVibrator.java

…

TokenWatcher.java

…

Trace.java

Trace SQLite operations

2015-12-14 12:32:26 -08:00

TransactionTooLargeException.java

Improve reporting to apps of transaction too large failures.

2015-05-21 18:19:50 -07:00

TransactionTracker.java

Add binder transaction tracking.

2015-06-22 16:28:24 -04:00

UEventObserver.java

…

UpdateEngine.java

Add system APIs for A/B update.

2016-02-08 10:38:35 -08:00

UpdateEngineCallback.java

Add system APIs for A/B update.

2016-02-08 10:38:35 -08:00

UpdateLock.java

…

UserHandle.aidl

…

UserHandle.java

Expose APIs to analyze UIDs in UserHandle/Process.

2016-02-10 15:20:33 -08:00

UserManager.java

DPM.createAndManageUser should work even with DISALLOW_ADD_USER set

2016-02-11 14:43:18 +01:00

UserManagerInternal.java

DPM.createAndManageUser should work even with DISALLOW_ADD_USER set

2016-02-11 14:43:18 +01:00

Vibrator.java

…

WorkSource.aidl

…

WorkSource.java

…