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

Merge "Add a system API to make a package become visible to other package" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-11 05:21:08 +00:00
committed by Android (Google) Code Review
parent a56e6c1f97 829792d752
commit 78a0333f67
8 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -102,6 +102,7 @@ package android.content.pm {
public abstract class PackageManager {
method @NonNull public String getPermissionControllerPackageName();
method @NonNull public String getSdkSandboxPackageName();
method @RequiresPermission("android.permission.MAKE_UID_VISIBLE") public void makeUidVisible(int, int);
field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";
field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000
}

2
core/api/test-current.txt
View File

@@ -19,6 +19,7 @@ package android {
field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE";
field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES";
field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
@@ -836,6 +837,7 @@ package android.content.pm {
method @Nullable public String getSystemTextClassifierPackageName();
method @Nullable public String getWellbeingPackageName();
method public void holdLock(android.os.IBinder, int);
method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);
method @RequiresPermission(android.Manifest.permission.KEEP_UNINSTALLED_PACKAGES) public void setKeepUninstalledPackages(@NonNull java.util.List<java.lang.String>);
field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";
field public static final String FEATURE_COMMUNAL_MODE = "android.software.communal_mode";

9
core/java/android/app/ApplicationPackageManager.java
View File

@@ -3832,4 +3832,13 @@ public class ApplicationPackageManager extends PackageManager {
throw re.rethrowAsRuntimeException();
}
}
@Override
public void makeUidVisible(int recipientUid, int visibleUid) {
try {
mPM.makeUidVisible(recipientUid, visibleUid);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
}
}

6
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -781,7 +781,11 @@ interface IPackageManager {
boolean isAutoRevokeWhitelisted(String packageName);
void grantImplicitAccess(int queryingUid, String visibleAuthority);
void makeProviderVisible(int recipientAppId, String visibleAuthority);
@JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest"
+ ".permission.MAKE_UID_VISIBLE)")
void makeUidVisible(int recipientAppId, int visibleUid);
IBinder getHoldLockToken();

25
core/java/android/content/pm/PackageManager.java
View File

@@ -10281,19 +10281,38 @@ public abstract class PackageManager {
}
/**
* Grants implicit visibility of the package that provides an authority to a querying UID.
* Makes a package that provides an authority {@code visibleAuthority} become visible to the
* application {@code recipientUid}.
*
* @throws SecurityException when called by a package other than the contacts provider
* @hide
*/
public void grantImplicitAccess(int queryingUid, String visibleAuthority) {
public void makeProviderVisible(int recipientUid, String visibleAuthority) {
try {
ActivityThread.getPackageManager().grantImplicitAccess(queryingUid, visibleAuthority);
ActivityThread.getPackageManager().makeProviderVisible(recipientUid, visibleAuthority);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Makes the package associated with the uid {@code visibleUid} become visible to the
* recipient uid application.
*
* @param recipientUid The uid of the application that is being given access to {@code
* visibleUid}
* @param visibleUid The uid of the application that is becoming accessible to {@code
* recipientAppId}
* @hide
*/
@RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE)
@TestApi
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void makeUidVisible(int recipientUid, int visibleUid) {
throw new UnsupportedOperationException(
"makeUidVisible not implemented in subclass");
}
// Some of the flags don't affect the query result, but let's be conservative and cache
// each combination of flags separately.

6
core/res/AndroidManifest.xml
View File

@@ -6420,6 +6420,12 @@
<permission android:name="android.permission.WRITE_SECURITY_LOG"
android:protectionLevel="signature|privileged" />
<!-- Allows an UID to be visible to the application based on an interaction between the
two apps. This permission is not intended to be held by apps.
@hide @TestApi -->
<permission android:name="android.permission.MAKE_UID_VISIBLE"
android:protectionLevel="signature" />
<!-- Attribution for Geofencing service. -->
<attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>
<!-- Attribution for Country Detector. -->

3
packages/Shell/AndroidManifest.xml
View File

@@ -668,6 +668,9 @@
<!-- Permission required for CTS test - CtsTelephonyTestCases -->
<uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
<!-- Permission required for CTS test - CtsAppEnumerationTestCases -->
<uses-permission android:name="android.permission.MAKE_UID_VISIBLE" />
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"

22
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -5062,7 +5062,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
}
@Override
public void grantImplicitAccess(int recipientUid, @NonNull String visibleAuthority) {
public void makeProviderVisible(int recipientUid, @NonNull String visibleAuthority) {
final Computer snapshot = snapshotComputer();
final int recipientUserId = UserHandle.getUserId(recipientUid);
final ProviderInfo providerInfo =
@@ -5076,6 +5076,26 @@ public class PackageManagerService implements PackageSender, TestUtilityService
false /*direct*/, false /* retainOnUpdate */);
}
@Override
public void makeUidVisible(int recipientUid, int visibleUid) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.MAKE_UID_VISIBLE, "makeUidVisible");
final int callingUid = Binder.getCallingUid();
final int recipientUserId = UserHandle.getUserId(recipientUid);
final int visibleUserId = UserHandle.getUserId(visibleUid);
final Computer snapshot = snapshotComputer();
snapshot.enforceCrossUserPermission(callingUid, recipientUserId,
false /* requireFullPermission */, false /* checkShell */, "makeUidVisible");
snapshot.enforceCrossUserPermission(callingUid, visibleUserId,
false /* requireFullPermission */, false /* checkShell */, "makeUidVisible");
snapshot.enforceCrossUserPermission(recipientUid, visibleUserId,
false /* requireFullPermission */, false /* checkShell */, "makeUidVisible");
PackageManagerService.this.grantImplicitAccess(snapshot, recipientUserId,
null /*Intent*/, UserHandle.getAppId(recipientUid), visibleUid,
false /*direct*/, false /* retainOnUpdate */);
}
@Override
public void holdLock(IBinder token, int durationMs) {
mTestUtilityService.verifyHoldLockToken(token);