Samuel Tan 01208118b3 resolve merge conflicts of 3caecaec60 to master. ...

Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f

2016-01-13 13:42:00 -08:00

..

storage

Even more PackageManager caller triage.

2016-01-08 18:35:54 -07:00

AsyncResult.java

…

AsyncTask.java

Tweak AsyncTask#THREAD_POOL_EXECUTOR settings

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

BadParcelableException.java

…

BaseBundle.java

Merge "Add comments to keep Java and native binder PersistableBundle in sync" am: 6de926a7d6

2015-12-17 09:55:24 -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

Fix reporting of uid state in battery stats.

2015-12-01 16:53:28 -08:00

Binder.java

Add new "shell command" feature to Binder objects.

2015-10-12 10:38:41 -07: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

am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"

2015-04-28 09:48:24 +00:00

CancellationSignal.java

…

CommonClock.java

…

CommonTimeConfig.java

…

CommonTimeUtils.java

…

ConditionVariable.java

…

CountDownTimer.java

…

DeadObjectException.java

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

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

Debug.java

Report SwapPss usage if available as part of Pss

2016-01-12 10:15:25 -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

Allow library spec and app configs to be read from odm partition

2015-12-17 11:14:40 +08:00

FactoryTest.java

…

FileBridge.java

…

FileObserver.java

…

FileUtils.java

Initial file-based encryption public APIs.

2015-11-06 18:35:27 -08:00

Handler.java

…

HandlerThread.java

…

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

Be smarter about determining when we can stop idle maintenance.

2015-11-16 16:38:29 -08:00

IInterface.java

…

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

Merge "UserManager: get/set user account name"

2015-12-08 21:42:22 +00: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

…

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

Merge "Add internal power mode changed broadcast"

2016-01-07 19:41:32 +00:00

PowerManagerInternal.java

Initial implementation of light-weight idle mode.

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

Process.java

Add Android permissions for audioserver

2015-12-08 15:35:00 -08:00

RecoverySystem.java

Switch RecoverySystem impl to use sun.security.pkcs

2015-12-22 13:10:55 +00: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

Some debugging improvements.

2015-11-11 12:45:44 -08:00

StatFs.java

…

StrictMode.java

Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 am: af588a31bc

2015-12-03 19:18:15 +00: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

…

UpdateLock.java

…

UserHandle.aidl

…

UserHandle.java

Even more PackageManager caller triage.

2016-01-08 18:35:54 -07:00

UserManager.java

Added Data roaming user restriction

2016-01-08 18:07:31 +00:00

UserManagerInternal.java

Don't call DPM from UserManager to avoid lock inversion

2015-11-25 11:17:08 -08:00

Vibrator.java

…

WorkSource.aidl

…

WorkSource.java

…