diff options
| -rw-r--r-- | libs/hwui/AssetAtlas.cpp | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/AssetAtlas.cpp b/libs/hwui/AssetAtlas.cpp index d8c90716f9f0..4d2fc0143f98 100644 --- a/libs/hwui/AssetAtlas.cpp +++ b/libs/hwui/AssetAtlas.cpp @@ -39,13 +39,17 @@ void AssetAtlas::init(sp<GraphicBuffer> buffer, int* map, int count) { createEntries(map, count); } else { + ALOGW("Could not create atlas image"); + delete mImage; + mImage = NULL; } } void AssetAtlas::terminate() { if (mImage) { delete mImage; + mImage = NULL; for (size_t i = 0; i < mEntries.size(); i++) { delete mEntries.valueAt(i); diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index b162c6bb6354..016a66466c29 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1795,7 +1795,7 @@ public class LocationManagerService extends ILocationManager.Stub { boolean receiverDead = false; int receiverUserId = UserHandle.getUserId(receiver.mUid); - if (receiverUserId != mCurrentUserId) { + if (receiverUserId != mCurrentUserId && !isUidALocationProvider(receiver.mUid)) { if (D) { Log.d(TAG, "skipping loc update for background user " + receiverUserId + " (current user: " + mCurrentUserId + ", app: " + |