diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-01-30 12:40:32 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2011-01-30 12:40:38 -0800 |
| commit | b2abd8c424a68eb6a5e3615a99f66c0bd46e6063 (patch) | |
| tree | ecc88a31068aa40c9244b2d88cdd06ad520fe617 /services | |
| parent | 3c89f6d1bd0821d0ae0205a5b48176156735aaac (diff) | |
| parent | 43abedde5f714beff82dbb5e94425fce6c13b8cd (diff) | |
| download | frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.zip frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.tar.gz frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.tar.bz2 | |
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/MountService.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index e4086c4..2c81c34 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -1835,7 +1835,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand AudioSystem::DEVICE_OUT_WIRED_HEADPHONE | AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET | AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) && - (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) && + ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) || + (stream == AudioSystem::SYSTEM)) && streamDesc.mCanBeMuted) { volume *= SONIFICATION_HEADSET_VOLUME_FACTOR; // when the phone is ringing we must consider that music could have been paused just before diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 5e1e7d5..436eff0 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -80,7 +80,7 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC private static final boolean LOCAL_LOGD = false; private static final boolean DEBUG_UNMOUNT = false; private static final boolean DEBUG_EVENTS = false; - private static final boolean DEBUG_OBB = true; + private static final boolean DEBUG_OBB = false; private static final String TAG = "MountService"; diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 5806de2..d75aef6 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -8043,6 +8043,14 @@ class PackageManagerService extends IPackageManager.Stub { sharedUser = orig.sharedUser; } + public void copyFrom(PackageSetting base) { + super.copyFrom((PackageSettingBase) base); + + userId = base.userId; + sharedUser = base.sharedUser; + pkg = base.pkg; + } + @Override public String toString() { return "PackageSetting{" |