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

Add userId to the package name API.

Browse Source 
The service would query package manager with the provided userId, and
will return true if the package is not visible.

Test: locally, b/143129258
Change-Id: Iab8ddaa76358d5fad63e10d7c4c3f92e2a0f51a2
Merged-In: I92ea650b49743c388bff9943a7ec620e3d61a5d6
This commit is contained in:
atrost
2019-10-22 19:44:09 +01:00
parent 577e3114da
commit 5076854633
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/compat/IPlatformCompat.aidl
View File

@@ -49,9 +49,10 @@ interface IPlatformCompat
* you do not need to call this API directly. The change will be reported for you.
*
* @param changeId The ID of the compatibility change taking effect.
* @param userId The ID of the user that the operation is done for.
* @param packageName The package name of the app in question.
*/
void reportChangeByPackageName(long changeId, in String packageName);
void reportChangeByPackageName(long changeId, in String packageName, int userId);
/**
* Reports that a compatibility change is affecting an app process now.
@@ -86,7 +87,7 @@ interface IPlatformCompat
* be called when implementing functionality on behalf of the affected app.
*
* <p>Same as {@link #isChangeEnabled(long, ApplicationInfo)}, except it receives a package name
* instead of an {@link ApplicationInfo}
* and userId instead of an {@link ApplicationInfo}
* object, and finds an app info object based on the package name. Returns {@code true} if
* there is no installed package by that name.
*
@@ -100,9 +101,10 @@ interface IPlatformCompat
*
* @param changeId The ID of the compatibility change in question.
* @param packageName The package name of the app in question.
* @param userId The ID of the user that the operation is done for.
* @return {@code true} if the change is enabled for the current app.
*/
boolean isChangeEnabledByPackageName(long changeId, in String packageName);
boolean isChangeEnabledByPackageName(long changeId, in String packageName, int userId);
/**
* Query if a given compatibility change is enabled for an app process. This method should

6
native/android/aidl/com/android/internal/compat/IPlatformCompatNative.aidl
View File

@@ -33,9 +33,10 @@ interface IPlatformCompatNative
* you do not need to call this API directly. The change will be reported for you.
*
* @param changeId The ID of the compatibility change taking effect.
* @param userId The ID of the user that the operation is done for.
* @param packageName The package name of the app in question.
*/
void reportChangeByPackageName(long changeId, @utf8InCpp String packageName);
void reportChangeByPackageName(long changeId, @utf8InCpp String packageName, int userId);
/**
* Reports that a compatibility change is affecting an app process now.
@@ -64,9 +65,10 @@ interface IPlatformCompatNative
*
* @param changeId The ID of the compatibility change in question.
* @param packageName The package name of the app in question.
* @param userId The ID of the user that the operation is done for.
* @return {@code true} if the change is enabled for the current app.
*/
boolean isChangeEnabledByPackageName(long changeId, @utf8InCpp String packageName);
boolean isChangeEnabledByPackageName(long changeId, @utf8InCpp String packageName, int userId);
/**
* Query if a given compatibility change is enabled for an app process. This method should

18
services/core/java/com/android/server/compat/PlatformCompat.java
View File

@@ -19,7 +19,7 @@ package com.android.server.compat;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Process;
import android.os.UserHandle;
import android.util.Slog;
import android.util.StatsLog;
@@ -54,8 +54,8 @@ public class PlatformCompat extends IPlatformCompat.Stub {
}
@Override
public void reportChangeByPackageName(long changeId, String packageName) {
ApplicationInfo appInfo = getApplicationInfo(packageName);
public void reportChangeByPackageName(long changeId, String packageName, int userId) {
ApplicationInfo appInfo = getApplicationInfo(packageName, userId);
if (appInfo == null) {
return;
}
@@ -80,8 +80,8 @@ public class PlatformCompat extends IPlatformCompat.Stub {
}
@Override
public boolean isChangeEnabledByPackageName(long changeId, String packageName) {
ApplicationInfo appInfo = getApplicationInfo(packageName);
public boolean isChangeEnabledByPackageName(long changeId, String packageName, int userId) {
ApplicationInfo appInfo = getApplicationInfo(packageName, userId);
if (appInfo == null) {
return true;
}
@@ -96,7 +96,8 @@ public class PlatformCompat extends IPlatformCompat.Stub {
}
boolean enabled = true;
for (String packageName : packages) {
enabled = enabled && isChangeEnabledByPackageName(changeId, packageName);
enabled = enabled && isChangeEnabledByPackageName(changeId, packageName,
UserHandle.getUserId(uid));
}
return enabled;
}
@@ -127,10 +128,9 @@ public class PlatformCompat extends IPlatformCompat.Stub {
mChangeReporter.resetReportedChanges(appInfo.uid);
}
private ApplicationInfo getApplicationInfo(String packageName) {
private ApplicationInfo getApplicationInfo(String packageName, int userId) {
try {
return mContext.getPackageManager().getApplicationInfoAsUser(packageName, 0,
Process.myUid());
return mContext.getPackageManager().getApplicationInfoAsUser(packageName, 0, userId);
} catch (PackageManager.NameNotFoundException e) {
Slog.e(TAG, "No installed package " + packageName);
}

8
services/core/java/com/android/server/compat/PlatformCompatNative.java
View File

@@ -29,8 +29,8 @@ public class PlatformCompatNative extends IPlatformCompatNative.Stub {
}
@Override
public void reportChangeByPackageName(long changeId, String packageName) {
mPlatformCompat.reportChangeByPackageName(changeId, packageName);
public void reportChangeByPackageName(long changeId, String packageName, int userId) {
mPlatformCompat.reportChangeByPackageName(changeId, packageName, userId);
}
@Override
@@ -39,8 +39,8 @@ public class PlatformCompatNative extends IPlatformCompatNative.Stub {
}
@Override
public boolean isChangeEnabledByPackageName(long changeId, String packageName) {
return mPlatformCompat.isChangeEnabledByPackageName(changeId, packageName);
public boolean isChangeEnabledByPackageName(long changeId, String packageName, int userId) {
return mPlatformCompat.isChangeEnabledByPackageName(changeId, packageName, userId);
}
@Override