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

Merge "Nullify the default wallpaper component if it does not exist"

Browse Source 
am: b25a4d60e6

Change-Id: I9a01944dec9c5e6c3366ddf62e9bc9a04e757e4f
This commit is contained in:
SzuWei Lin
2018-11-30 09:01:41 -08:00
committed by android-build-merger
parent 1f12c3112d b25a4d60e6
commit ae7bf51ae5
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/app/WallpaperManager.java
View File

@@ -1885,23 +1885,33 @@ public class WallpaperManager {
* @hide * @hide
*/ */
public static ComponentName getDefaultWallpaperComponent(Context context) { public static ComponentName getDefaultWallpaperComponent(Context context) {
ComponentName cn = null;
String flat = SystemProperties.get(PROP_WALLPAPER_COMPONENT); String flat = SystemProperties.get(PROP_WALLPAPER_COMPONENT);
if (!TextUtils.isEmpty(flat)) { if (!TextUtils.isEmpty(flat)) {
final ComponentName cn = ComponentName.unflattenFromString(flat); cn = ComponentName.unflattenFromString(flat);
if (cn != null) { }
return cn;
if (cn == null) {
flat = context.getString(com.android.internal.R.string.default_wallpaper_component);
if (!TextUtils.isEmpty(flat)) {
cn = ComponentName.unflattenFromString(flat);
} }
} }
flat = context.getString(com.android.internal.R.string.default_wallpaper_component); // Check if the package exists
if (!TextUtils.isEmpty(flat)) { if (cn != null) {
final ComponentName cn = ComponentName.unflattenFromString(flat); try {
if (cn != null) { final PackageManager packageManager = context.getPackageManager();
return cn; packageManager.getPackageInfo(cn.getPackageName(),
PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
} catch (PackageManager.NameNotFoundException e) {
cn = null;
} }
} }
return null; return cn;
} }
/** /**