Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev

Browse Source 
* commit 'fc324ddf0593b21694b7fcf315c6da607ff38805':
  Restored widget provider id not properly updated.
This commit is contained in:
Svetoslav
2014-10-09 13:16:45 +00:00
committed by Android Git Automerger
parent 36ae48a850 fc324ddf05
commit 202ff5f2e0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -1839,13 +1839,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
// If the provider was not found it may be because it was restored and // If the provider was not found it may be because it was restored and
// we did not know its UID so let us find if there is such one. // we did not know its UID so let us find if there is such one.
if (existing == null) { if (existing == null) {
providerId = new ProviderId(UNKNOWN_UID, componentName); ProviderId restoredProviderId = new ProviderId(UNKNOWN_UID, componentName);
existing = lookupProviderLocked(providerId); existing = lookupProviderLocked(restoredProviderId);
} }
if (existing != null) { if (existing != null) {
if (existing.zombie && !mSafeMode) { if (existing.zombie && !mSafeMode) {
// it's a placeholder that was set up during an app restore // it's a placeholder that was set up during an app restore
existing.id = providerId;
existing.zombie = false; existing.zombie = false;
existing.info = provider.info; // the real one filled out from the ResolveInfo existing.info = provider.info; // the real one filled out from the ResolveInfo
if (DEBUG) { if (DEBUG) {