LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Make onPackage[Added|Removed] as non-public methods"

Browse Source
This commit is contained in:
Paul Hu
2022-11-07 01:35:11 +00:00
committed by Gerrit Code Review
parent 39d64b1dce 914d0def25
commit bd92295269
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -758,7 +758,8 @@ public class PermissionMonitor {
* *
* @hide * @hide
*/ */
public synchronized void onPackageAdded(@NonNull final String packageName, final int uid) { @VisibleForTesting
synchronized void onPackageAdded(@NonNull final String packageName, final int uid) {
// Update uid permission. // Update uid permission.
updateAppIdTrafficPermission(uid); updateAppIdTrafficPermission(uid);
// Get the appId permission from all users then send the latest permission to netd. // Get the appId permission from all users then send the latest permission to netd.
@@ -821,7 +822,8 @@ public class PermissionMonitor {
* *
* @hide * @hide
*/ */
public synchronized void onPackageRemoved(@NonNull final String packageName, final int uid) { @VisibleForTesting
synchronized void onPackageRemoved(@NonNull final String packageName, final int uid) {
// Update uid permission. // Update uid permission.
updateAppIdTrafficPermission(uid); updateAppIdTrafficPermission(uid);
// Get the appId permission from all users then send the latest permission to netd. // Get the appId permission from all users then send the latest permission to netd.

7
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3477,7 +3477,12 @@ public class ConnectivityServiceTest {
final int uid, final String packageName) throws Exception { final int uid, final String packageName) throws Exception {
doReturn(buildPackageInfo(true /* hasSystemPermission */, uid)).when(mPackageManager) doReturn(buildPackageInfo(true /* hasSystemPermission */, uid)).when(mPackageManager)
.getPackageInfo(eq(packageName), eq(GET_PERMISSIONS)); .getPackageInfo(eq(packageName), eq(GET_PERMISSIONS));
mService.mPermissionMonitor.onPackageAdded(packageName, uid);
// Send a broadcast indicating a package was installed.
final Intent addedIntent = new Intent(ACTION_PACKAGE_ADDED);
addedIntent.putExtra(Intent.EXTRA_UID, uid);
addedIntent.setData(Uri.parse("package:" + packageName));
processBroadcast(addedIntent);
} }
@Test @Test