PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only check INTERACT_ACROSS_USERS_FULL when user handle is not current" into main

Browse Source
This commit is contained in:
Chris Antol
2024-08-30 01:10:54 +00:00
committed by Android (Google) Code Review
parent e6aaa5c87b 78ee160c20
commit 0e1d5fdce4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -136,14 +136,14 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
mPackageName = intent.getData().getSchemeSpecificPart(); mPackageName = intent.getData().getSchemeSpecificPart();
} }
} }
if (!hasInteractAcrossUsersPermission()) {
Log.w(TAG, "Intent not valid.");
finish();
return "";
}
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) { if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
mUserId = ((UserHandle) intent.getParcelableExtra( mUserId = ((UserHandle) intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE))
Intent.EXTRA_USER_HANDLE)).getIdentifier(); .getIdentifier();
if (mUserId != UserHandle.myUserId() && !hasInteractAcrossUsersFullPermission()) {
Log.w(TAG, "Intent not valid.");
finish();
return "";
}
} else { } else {
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
} }
@@ -171,7 +171,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
} }
@VisibleForTesting @VisibleForTesting
protected boolean hasInteractAcrossUsersPermission() { protected boolean hasInteractAcrossUsersFullPermission() {
Activity activity = getActivity(); Activity activity = getActivity();
if (!(activity instanceof SettingsActivity)) { if (!(activity instanceof SettingsActivity)) {
return false; return false;

4
tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
View File

@@ -250,7 +250,7 @@ public class AppInfoWithHeaderTest {
} }
@Override @Override
protected boolean hasInteractAcrossUsersPermission() { protected boolean hasInteractAcrossUsersFullPermission() {
return true; return true;
} }
@@ -267,7 +267,7 @@ public class AppInfoWithHeaderTest {
private static final class TestFragmentWithoutPermission extends TestFragment { private static final class TestFragmentWithoutPermission extends TestFragment {
@Override @Override
protected boolean hasInteractAcrossUsersPermission() { protected boolean hasInteractAcrossUsersFullPermission() {
return false; return false;
} }
} }