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

Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2021-03-16 09:14:10 +00:00
committed by Android (Google) Code Review
parent 138fdb88cd f6fc46a76d
commit 7874170373
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2299,9 +2299,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public StartingSurface addSplashScreen(IBinder appToken, String packageName, int theme, public StartingSurface addSplashScreen(IBinder appToken, int userId, String packageName,
CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon, int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
int logo, int windowFlags, Configuration overrideConfig, int displayId) { int icon, int logo, int windowFlags, Configuration overrideConfig, int displayId) {
if (!SHOW_SPLASH_SCREENS) { if (!SHOW_SPLASH_SCREENS) {
return null; return null;
} }
@@ -2328,10 +2328,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (theme != context.getThemeResId() || labelRes != 0) { if (theme != context.getThemeResId() || labelRes != 0) {
try { try {
context = context.createPackageContext(packageName, CONTEXT_RESTRICTED); context = context.createPackageContextAsUser(packageName, CONTEXT_RESTRICTED,
UserHandle.of(userId));
context.setTheme(theme); context.setTheme(theme);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Ignore Slog.w(TAG, "Failed creating package context with package name "
+ packageName + " for user " + userId, e);
} }
} }

6
services/core/java/com/android/server/policy/WindowManagerPolicy.java
View File

@@ -933,9 +933,9 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
* @return The starting surface. * @return The starting surface.
* *
*/ */
public StartingSurface addSplashScreen(IBinder appToken, String packageName, int theme, public StartingSurface addSplashScreen(IBinder appToken, int userId, String packageName,
CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon, int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
int logo, int windowFlags, Configuration overrideConfig, int displayId); int icon, int logo, int windowFlags, Configuration overrideConfig, int displayId);
/** /**
* Set or clear a window which can behave as the keyguard. * Set or clear a window which can behave as the keyguard.

4
services/core/java/com/android/server/wm/SplashScreenStartingData.java
View File

@@ -53,8 +53,8 @@ class SplashScreenStartingData extends StartingData {
@Override @Override
StartingSurface createStartingSurface(ActivityRecord activity) { StartingSurface createStartingSurface(ActivityRecord activity) {
return mService.mPolicy.addSplashScreen(activity.token, mPkg, mTheme, mCompatInfo, return mService.mPolicy.addSplashScreen(activity.token, activity.mUserId, mPkg, mTheme,
mNonLocalizedLabel, mLabelRes, mIcon, mLogo, mWindowFlags, mCompatInfo, mNonLocalizedLabel, mLabelRes, mIcon, mLogo, mWindowFlags,
mMergedOverrideConfiguration, activity.getDisplayContent().getDisplayId()); mMergedOverrideConfiguration, activity.getDisplayContent().getDisplayId());
} }
} }

6
services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java
View File

@@ -109,9 +109,9 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
} }
@Override @Override
public StartingSurface addSplashScreen(IBinder appToken, String packageName, int theme, public StartingSurface addSplashScreen(IBinder appToken, int userId, String packageName,
CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon, int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
int logo, int windowFlags, Configuration overrideConfig, int displayId) { int icon, int logo, int windowFlags, Configuration overrideConfig, int displayId) {
final com.android.server.wm.WindowState window; final com.android.server.wm.WindowState window;
final ActivityRecord activity; final ActivityRecord activity;
final WindowManagerService wm = mWmSupplier.get(); final WindowManagerService wm = mWmSupplier.get();