Craig Mautner fbec92ca1a am d5759f1c: am 73220fa0: Merge "Merge errors." into jb-dev ...

* commit 'd5759f1c2c8038d6c8275b1ba7dc93a40763088c':
  Merge errors.

2012-06-12 13:00:50 -07:00

..

accessibility

Merge "Crash in the touch explorer." into jb-dev

2012-06-10 09:59:24 -07:00

am

DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.

2012-06-11 13:06:41 -07:00

connectivity

am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev

2012-06-12 12:59:59 -07:00

input

Fix comparison of device source bits.

2012-05-30 14:32:16 -07:00

location

Make location providers upgradeable.

2012-05-29 13:36:46 +02:00

net

Extend process observer to be usable for media routing.

2012-05-31 18:58:34 -07:00

pm

am 6e85ad7d: resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp

2012-06-11 12:24:54 -07:00

usb

…

wm

Merge errors.

2012-06-11 16:30:48 -07:00

AlarmManagerService.java

…

AppWidgetService.java

…

AppWidgetServiceImpl.java

…

AttributeCache.java

…

BackupManagerService.java

Eliminate "backup enabled but not provisioned" failure modes

2012-05-17 16:02:15 -07:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

CertBlacklister.java

…

ClipboardService.java

…

CommonTimeManagementService.java

…

ConnectivityService.java

Modify logging to debug this issue

2012-05-24 10:47:10 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."

2012-05-25 08:13:03 -07:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyMixer.java

…

EventLogTags.logtags

Added code to log the current value of the "allow unknown sources" setting after

2012-05-22 16:18:20 -07:00

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Fix issue #5680541: onStartInputView called upon focus loss

2012-05-22 16:30:34 -07:00

IntentResolver.java

…

LightsService.java

…

LocationManagerService.java

Make location providers upgradeable.

2012-05-29 13:36:46 +02:00

MasterClearReceiver.java

…

MountService.java

am 60c77212: am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"

2012-06-08 15:36:41 -07:00

NativeDaemonConnector.java

Fix a sync problem in NativeDaemonConnector.

2012-06-07 11:22:54 -07:00

NativeDaemonConnectorException.java

…

NativeDaemonEvent.java

…

NetworkManagementService.java

Modify logging to debug this issue

2012-05-24 10:47:10 -07:00

NetworkTimeUpdateService.java

…

NotificationManagerService.java

Be more discriminating when canceling notifications on changing packages.

2012-06-01 16:26:46 -04:00

NsdService.java

resolved conflicts for merge of e7884dbb to master

2012-06-05 09:49:24 -07:00

PackageManagerBackupAgent.java

…

PowerManagerService.java

am a8e46828: am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"

2012-06-08 19:00:38 -07:00

PreferredComponent.java

…

ProcessMap.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

SerialService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

Removing a notification that isn't there isn't a big deal.

2012-05-16 12:43:02 -04:00

SystemBackupAgent.java

…

SystemServer.java

am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"

2012-06-11 16:36:52 -07:00

TelephonyRegistry.java

…

TextServicesManagerService.java

Fix locale in TextServicesManagerService

2012-05-30 20:36:52 +09:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

Dock: Renable desk-dock apps

2012-05-29 18:19:57 -04:00

UpdateLockService.java

…

VibratorService.java

…

WallpaperManagerService.java

…

Watchdog.java

Include important native processes in watchdog stacks.

2012-06-08 18:36:48 -07:00

WifiService.java

Merge "handleAirplaneModeToggled cleanup" into jb-dev

2012-05-17 14:19:46 -07:00

WiredAccessoryObserver.java

Send device connection intents from AudioService

2012-05-30 14:44:43 -07:00