Make onPackage[Added|Removed] as non-public methods
In the past, CS would receive package add/remove intent and notify
PermissionMonitor by onPackage[Added|Removed] method.
Now, PermissionMonitor receives those intents itself, so CS will
not call these two methods anymore. Thus, these two methods do not
need to be public, make them as package private methods.
Bug: 232048835
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I516edd1e900d7515bf383eeab2492eace97d780a
diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java
index fd1ed60..aeca717 100755
--- a/service/src/com/android/server/connectivity/PermissionMonitor.java
+++ b/service/src/com/android/server/connectivity/PermissionMonitor.java
@@ -758,7 +758,8 @@
*
* @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.
updateAppIdTrafficPermission(uid);
// Get the appId permission from all users then send the latest permission to netd.
@@ -821,7 +822,8 @@
*
* @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.
updateAppIdTrafficPermission(uid);
// Get the appId permission from all users then send the latest permission to netd.
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index d7440bb..887482e 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -3484,7 +3484,12 @@
final int uid, final String packageName) throws Exception {
doReturn(buildPackageInfo(true /* hasSystemPermission */, uid)).when(mPackageManager)
.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