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

Merge "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once"" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-18 12:11:48 +00:00
committed by Android (Google) Code Review
parent 67f04ed84b 202e35b7cf
commit 58ef180354
1 changed files with 1 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/android/view/Display.java
View File

@@ -25,11 +25,9 @@ import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.ActivityThread;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.WindowConfiguration; import android.app.WindowConfiguration;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.res.CompatibilityInfo; import android.content.res.CompatibilityInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
@@ -50,14 +48,11 @@ import android.util.ArraySet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import com.android.internal.R;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* Provides information about the size and density of a logical display. * Provides information about the size and density of a logical display.
@@ -121,12 +116,6 @@ public final class Display {
*/ */
private boolean mMayAdjustByFixedRotation; private boolean mMayAdjustByFixedRotation;
/**
* Cache if the application is the recents component.
* TODO(b/179308296) Remove once Launcher addresses issue
*/
private Optional<Boolean> mIsRecentsComponent = Optional.empty();
/** /**
* The default Display id, which is the id of the primary display assuming there is one. * The default Display id, which is the id of the primary display assuming there is one.
*/ */
@@ -1463,36 +1452,7 @@ public final class Display {
return false; return false;
} }
final Configuration config = mResources.getConfiguration(); final Configuration config = mResources.getConfiguration();
// TODO(b/179308296) Temporarily exclude Launcher from being given max bounds, by checking return config != null && !config.windowConfiguration.getMaxBounds().isEmpty();
// if the caller is the recents component.
return config != null && !config.windowConfiguration.getMaxBounds().isEmpty()
&& !isRecentsComponent();
}
/**
* Returns {@code true} when the calling package is the recents component.
* TODO(b/179308296) Remove once Launcher addresses issue
*/
boolean isRecentsComponent() {
if (mIsRecentsComponent.isPresent()) {
return mIsRecentsComponent.get();
}
if (mResources == null) {
return false;
}
try {
String recentsComponent = mResources.getString(R.string.config_recentsComponentName);
if (recentsComponent == null) {
return false;
}
String recentsPackage = ComponentName.unflattenFromString(recentsComponent)
.getPackageName();
mIsRecentsComponent = Optional.of(recentsPackage != null
&& recentsPackage.equals(ActivityThread.currentPackageName()));
return mIsRecentsComponent.get();
} catch (Resources.NotFoundException e) {
return false;
}
} }
/** /**