Tim Kilbourn e13fb40ecb resolved conflicts for 0816319a to master ...

Change-Id: Ie89ccd479a2eccc95839c162a9b7367349d3886f

2015-09-17 12:50:34 -07:00

..

storage

am 39c49625: am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

2015-08-20 01:59:19 +00:00

AsyncResult.java

…

AsyncTask.java

More maybe fix issue #22765972: Binder transactions running out...

2015-07-29 17:58:33 -07:00

BadParcelableException.java

…

BaseBundle.java

…

BatteryManager.java

Show charging speed on Keyguard

2015-07-14 18:22:39 +00:00

BatteryManagerInternal.java

…

BatteryProperties.aidl

…

BatteryProperties.java

Show charging speed on Keyguard

2015-07-14 18:22:39 +00:00

BatteryProperty.aidl

…

BatteryProperty.java

…

BatteryStats.java

Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev

2015-08-31 19:04:46 +00:00

Binder.java

Add binder transaction tracking.

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

Broadcaster.java

…

Build.java

Fix issue #23116383: Include security patch level in Settings

2015-08-12 16:10:58 -07: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

Clarify art.gc.gc-count-rate-histogram runtime stat.

2015-06-23 13:28:25 -07:00

DropBoxManager.aidl

…

DropBoxManager.java

DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.

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

Environment.java

Give secondary users read-only physical cards.

2015-07-28 14:42:34 -07:00

FactoryTest.java

…

FileBridge.java

…

FileObserver.java

…

FileUtils.java

More info to support CTS, fix reconcile bug.

2015-07-22 11:11:50 -07:00

Handler.java

…

HandlerThread.java

…

IBatteryPropertiesListener.aidl

…

IBatteryPropertiesRegistrar.aidl

…

IBinder.java

Work on issue #22765972: Binder transactions running out of address...

2015-07-28 18:13:21 -07:00

ICancellationSignal.aidl

…

IDeviceIdleController.aidl

Fix issue #22989030: Separate battery whitelists

2015-08-07 14:23:32 -07: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

am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"

2015-08-03 17:56:37 +00:00

IProcessInfoService.aidl

…

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

…

IServiceManager.java

…

IUpdateLock.aidl

…

IUserManager.aidl

Allow non-owner users to have managed profiles.

2015-08-20 14:15:19 +01: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

Icon: a clean, parcelable place for images.

2015-05-01 13:44:42 -04:00

Parcelable.java

Avoid parceling redundant ApplicationInfo objects within PackageInfo

2015-09-10 14:04:01 -07:00

ParcelableParcel.aidl

…

ParcelableParcel.java

…

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

Fix the PFD detachFd issue.

2015-06-11 12:34:22 -07:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

…

PerformanceCollector.java

…

PersistableBundle.aidl

…

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

am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"

2015-08-03 17:56:37 +00:00

PowerManagerInternal.java

am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev

2015-09-17 02:33:35 +00:00

Process.java

Let's reinvent storage, yet again!

2015-06-25 22:25:48 -07:00

RecoverySystem.java

am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

2015-08-18 22:41:34 +00:00

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

…

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

…

ServiceManagerNative.java

…

StatFs.java

…

StrictMode.java

am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"

2015-07-14 22:53:05 +00:00

SystemClock.java

…

SystemProperties.java

…

SystemService.java

…

SystemVibrator.java

…

TokenWatcher.java

…

Trace.java

Add trace code to system server.

2015-08-27 12:22:07 +09: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

Refactor UserHandle.java

2015-09-16 18:07:19 +00:00

UserManager.java

Non-system users can now have restricted profiles

2015-08-27 15:38:29 -07:00

Vibrator.java

…

WorkSource.aidl

…

WorkSource.java

…