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

Merge "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" into udc-dev

Browse Source
This commit is contained in:
Austin Wang
2023-06-07 21:53:50 +00:00
committed by Android (Google) Code Review
parent c0ef92234d 72a0125baf
commit 1c53aa4f43
6 changed files with 13 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2933,62 +2933,21 @@ public class WallpaperManager {
}
}
if (!isComponentExist(context, cn)) {
cn = null;
}
return cn;
}
/**
* Return {@link ComponentName} of the CMF default wallpaper, or
* {@link #getDefaultWallpaperComponent(Context)} if none is defined.
*
* @hide
*/
public static ComponentName getCmfDefaultWallpaperComponent(Context context) {
ComponentName cn = null;
String[] cmfWallpaperMap = context.getResources().getStringArray(
com.android.internal.R.array.cmf_default_wallpaper_component);
if (cmfWallpaperMap == null || cmfWallpaperMap.length == 0) {
Log.d(TAG, "No CMF wallpaper config");
return getDefaultWallpaperComponent(context);
}
for (String entry : cmfWallpaperMap) {
String[] cmfWallpaper;
if (!TextUtils.isEmpty(entry)) {
cmfWallpaper = entry.split(",");
if (cmfWallpaper != null && cmfWallpaper.length == 2 && VALUE_CMF_COLOR.equals(
cmfWallpaper[0]) && !TextUtils.isEmpty(cmfWallpaper[1])) {
cn = ComponentName.unflattenFromString(cmfWallpaper[1]);
break;
}
// Check if the package exists
if (cn != null) {
try {
final PackageManager packageManager = context.getPackageManager();
packageManager.getPackageInfo(cn.getPackageName(),
PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
} catch (PackageManager.NameNotFoundException e) {
cn = null;
}
}
if (!isComponentExist(context, cn)) {
cn = null;
}
return cn;
}
private static boolean isComponentExist(Context context, ComponentName cn) {
if (cn == null) {
return false;
}
try {
final PackageManager packageManager = context.getPackageManager();
packageManager.getPackageInfo(cn.getPackageName(),
PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
} catch (PackageManager.NameNotFoundException e) {
return false;
}
return true;
}
/**
* Register a callback for lock wallpaper observation. Only the OS may use this.
*

10
core/res/res/values/config.xml
View File

@@ -1817,16 +1817,6 @@
specified -->
<string name="default_wallpaper_component" translatable="false">@null</string>
<!-- CMF colors to default wallpaper component map, the component with color matching the device
color will be the cmf default wallpapers. The default wallpaper will be default wallpaper
component if not specified.
E.g. for SLV color, and com.android.example/com.android.example.SlVDefaultWallpaper
<item>SLV,com.android.example/com.android.example.SlVDefaultWallpaper</item> -->
<string-array name="cmf_default_wallpaper_component" translatable="false">
<!-- Add packages here -->
</string-array>
<!-- By default a product has no distinct default lock wallpaper -->
<item name="default_lock_wallpaper" type="drawable">@null</item>

1
core/res/res/values/symbols.xml
View File

@@ -2116,7 +2116,6 @@
<java-symbol type="string" name="data_usage_rapid_body" />
<java-symbol type="string" name="data_usage_rapid_app_body" />
<java-symbol type="string" name="default_wallpaper_component" />
<java-symbol type="array" name="cmf_default_wallpaper_component" />
<java-symbol type="string" name="device_storage_monitor_notification_channel" />
<java-symbol type="string" name="dlg_ok" />
<java-symbol type="string" name="dump_heap_notification" />

2
services/core/java/com/android/server/WallpaperUpdateReceiver.java
View File

@@ -88,7 +88,7 @@ public class WallpaperUpdateReceiver extends BroadcastReceiver {
} else {
//live wallpaper
ComponentName currCN = info.getComponent();
ComponentName defaultCN = WallpaperManager.getCmfDefaultWallpaperComponent(context);
ComponentName defaultCN = WallpaperManager.getDefaultWallpaperComponent(context);
if (!currCN.equals(defaultCN)) {
return true;
}

2
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -1588,7 +1588,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
mShuttingDown = false;
mImageWallpaper = ComponentName.unflattenFromString(
context.getResources().getString(R.string.image_wallpaper_component));
mDefaultWallpaperComponent = WallpaperManager.getCmfDefaultWallpaperComponent(context);
mDefaultWallpaperComponent = WallpaperManager.getDefaultWallpaperComponent(context);
mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);
mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
mIPackageManager = AppGlobals.getPackageManager();

4
services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java
View File

@@ -172,12 +172,12 @@ public class WallpaperManagerServiceTests {
sImageWallpaperComponentName = ComponentName.unflattenFromString(
sContext.getResources().getString(R.string.image_wallpaper_component));
// Mock default wallpaper as image wallpaper if there is no pre-defined default wallpaper.
sDefaultWallpaperComponent = WallpaperManager.getCmfDefaultWallpaperComponent(sContext);
sDefaultWallpaperComponent = WallpaperManager.getDefaultWallpaperComponent(sContext);
if (sDefaultWallpaperComponent == null) {
sDefaultWallpaperComponent = sImageWallpaperComponentName;
doReturn(sImageWallpaperComponentName).when(() ->
WallpaperManager.getCmfDefaultWallpaperComponent(any()));
WallpaperManager.getDefaultWallpaperComponent(any()));
} else {
sContext.addMockService(sDefaultWallpaperComponent, sWallpaperService);
}