Greg Hackmann 4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp ...

* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService

2014-02-22 00:46:52 +00:00

..

storage

Support default, pattern, pin and password encryption types

2014-02-13 15:46:24 +00:00

AsyncResult.java

…

AsyncTask.java

Docfixes: three typos and escape */*.

2014-01-06 11:44:42 -05:00

BadParcelableException.java

…

BatteryManager.java

…

BatteryProperties.aidl

Add libbatteryservice AIDL and java interfaces

2013-07-25 02:13:49 +00:00

BatteryProperties.java

BatteryService: remove dumpsys-only info duplicated by systemhealth

2013-10-23 00:15:08 +00:00

BatteryProperty.aidl

java-side interface for reading individual battery properties on demand

2013-08-22 03:12:21 +00:00

BatteryProperty.java

BatteryProperty: Add average current property

2013-09-04 18:20:22 -07:00

BatteryStats.java

Implement wifi part of issue #12973036: Improve power_profile.xml

2014-02-18 14:43:14 -08:00

Binder.java

AArch64: Make Binder and Parcel 64-bit compatible

2014-01-23 16:25:19 +00:00

Broadcaster.java

…

Build.java

Doc change: Change description for BRAND.

2013-11-21 09:31:40 -08:00

Bundle.aidl

…

Bundle.java

am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"

2013-11-14 16:37:55 -08:00

CancellationSignal.java

Print - platform APIs

2013-06-21 18:43:17 -07:00

CommonClock.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

CommonTimeConfig.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

CommonTimeUtils.java

…

ConditionVariable.java

…

CountDownTimer.java

Fixed cancel() not working correctly

2014-01-30 13:46:44 +00:00

DeadObjectException.java

…

Debug.java

am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."

2014-01-15 19:50:53 +00:00

DropBoxManager.aidl

…

DropBoxManager.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Environment.java

Detect removable and emulated secondary storage.

2014-01-15 17:00:56 -08:00

FactoryTest.java

Start untangling system server early bootstrapping.

2014-01-16 11:24:58 -08:00

FileObserver.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

FileUtils.java

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

Handler.java

Document that Handler.postDelayed uses uptimeMillis() based counting.

2013-12-19 18:37:01 -08:00

HandlerThread.java

…

IBatteryPropertiesListener.aidl

Add libbatteryservice AIDL and java interfaces

2013-07-25 02:13:49 +00:00

IBatteryPropertiesRegistrar.aidl

java-side interface for reading individual battery properties on demand

2013-08-22 03:12:21 +00:00

IBinder.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ICancellationSignal.aidl

…

IHardwareService.aidl

…

IInterface.java

…

IMessenger.aidl

…

INetworkManagementService.aidl

Request all tethering interfaces, fix corruption.

2013-09-10 21:03:30 -07:00

IPermissionController.aidl

…

IPowerManager.aidl

Add a method to set a list of uids for a wake lock

2013-10-25 12:49:55 -07:00

IRemoteCallback.aidl

…

ISchedulingPolicyService.aidl

…

IServiceManager.java

…

IUpdateLock.aidl

…

IUserManager.aidl

Add concepts of related users and managed profiles to user manager.

2014-02-11 15:33:14 +00:00

IVibratorService.aidl

…

Looper.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

MemoryFile.java

AArch64: Use long for pointers in android/os/MemoryFile

2014-01-10 15:14:46 +00:00

Message.aidl

…

Message.java

Log view root, input and looper state in bug reports.

2013-10-15 20:31:52 -07:00

MessageQueue.java

Track AArch64 changes from AOSP.

2014-01-16 16:01:22 +00:00

Messenger.aidl

…

Messenger.java

…

NetworkOnMainThreadException.java

…

NullVibrator.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

OperationCanceledException.java

…

package.html

…

Parcel.java

am 48dcf9d5: am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."

2014-02-21 17:37:58 +00:00

Parcelable.java

…

ParcelableParcel.java

New UndoManager.

2013-05-07 15:05:09 -07:00

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev

2013-10-25 13:28:50 -07:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

…

PerformanceCollector.java

…

PowerManager.java

resolved conflicts for merge of baaa080b to master

2014-02-20 18:05:03 -08:00

PowerManagerInternal.java

Refactor display manager service to new pattern.

2014-01-16 22:16:42 -08:00

Process.java

ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

2014-01-03 16:30:25 -08:00

RecoverySystem.java

am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl"

2013-10-14 14:04:55 -07:00

Registrant.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

RegistrantList.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

RemoteCallback.aidl

…

RemoteCallback.java

…

RemoteCallbackList.java

Print UI bug fixing and printer discovery refactoring.

2013-08-23 18:36:33 +00:00

RemoteException.java

…

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

SELinux.java

Fix SELinux.java doc errors

2013-05-22 13:25:15 +01:00

ServiceManager.java

…

ServiceManagerNative.java

…

StatFs.java

resolved conflicts for merge of 4a59376d to stage-aosp-master

2013-07-09 15:25:23 -07:00

StrictMode.java

Run finalizers before counting for StrictMode.

2014-01-16 12:46:43 -08:00

SystemClock.java

Move time setting code from SystemClock to AlarmManagerService

2014-02-21 09:53:19 -08:00

SystemProperties.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SystemService.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SystemVibrator.java

Fix issue #10688644: Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

TokenWatcher.java

…

Trace.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

TransactionTooLargeException.java

…

UEventObserver.java

…

UpdateLock.java

…

UserHandle.aidl

…

UserHandle.java

More procstats work.

2013-07-08 18:06:24 -07:00

UserManager.java

Add concepts of related users and managed profiles to user manager.

2014-02-11 15:33:14 +00:00

Vibrator.java

…

WorkSource.aidl

…

WorkSource.java

Fix broken method WorkSource.set (names aren't applied).

2013-09-23 16:01:08 -07:00