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

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

Browse Source 
* commit '3dd06d9005bd572a3b012b3a2b27adfa94533144':
  Restored widget provider id not properly updated.
This commit is contained in:
Svetoslav
2014-10-09 00:15:02 +00:00
committed by Android Git Automerger
parent 0761b1b5eb 3dd06d9005
commit 2f2864b7b1
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
// we did not know its UID so let us find if there is such one.
if (existing == null) {
providerId = new ProviderId(UNKNOWN_UID, componentName);
existing = lookupProviderLocked(providerId);
ProviderId restoredProviderId = new ProviderId(UNKNOWN_UID, componentName);
existing = lookupProviderLocked(restoredProviderId);
}
if (existing != null) {
if (existing.zombie && !mSafeMode) {
// it's a placeholder that was set up during an app restore
existing.id = providerId;
existing.zombie = false;
existing.info = provider.info; // the real one filled out from the ResolveInfo
if (DEBUG) {