Robert Greenwalt a7f68230be resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp ...

Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9

2011-07-25 12:08:19 -07:00

..

am

am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.

2011-06-14 21:50:56 -07:00

connectivity

Temporary re-enabling iface name change handling on HO

2011-06-23 14:58:50 -07:00

location

am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2

2011-05-23 18:45:17 -07:00

usb

…

wm

DO NOT MERGE. Fix density compat mode.

2011-06-23 12:29:03 -07:00

AccessibilityManagerService.java

…

AlarmManagerService.java

am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"

2011-06-20 13:20:49 -07:00

AppWidgetService.java

Fix issue #4502672: Wrong xml resources used for homescreen widgets.

2011-05-31 18:04:14 -07:00

AttributeCache.java

…

BackupManagerService.java

…

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp

2011-07-25 12:08:19 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()

2011-06-02 16:37:39 -07:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyService.java

…

EventLogTags.logtags

…

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Do not merge. Backport two fixes for InputMethethodFramework

2011-05-20 22:11:54 +09:00

Installer.java

…

IntentResolver.java

…

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountService.java

am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2

2011-05-23 17:09:30 -07:00

NativeDaemonConnector.java

…

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"

2011-07-06 07:48:21 -07:00

NetworkTimeUpdateService.java

…

NotificationManagerService.java

…

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

Break apart queries to getInstalled* API DO NOT MERGE

2011-05-26 09:53:24 -07:00

PowerManagerService.java

…

PreferredComponent.java

…

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

Fix issue #4603422: Compatibility mode button doesn't always update

2011-06-14 15:05:16 -07:00

SystemBackupAgent.java

…

SystemServer.java

…

TelephonyRegistry.java

TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.

2011-05-14 06:51:21 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

VibratorService.java

…

WallpaperManagerService.java

DO NOT MERGE. Integrate from master: Rework display size access.

2011-05-16 11:58:27 -07:00

Watchdog.java

…

WifiService.java

am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2

2011-06-08 20:02:43 -07:00

WifiStateTracker.java

…

WifiWatchdogService.java

…

WiredAccessoryObserver.java

…