Merge changes I50b8d4b6,I4aba9cf0 into rvc-dev

* changes:
  WifiServiceImpl: Fix package removed handling
  WifiShellCommand: Add a shell command for wifi settings reset

3 files changed, 10 insertions, 4 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index bb0ba82ef..16d1c42c5 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -3085,8 +3085,7 @@ public class WifiServiceImpl extends BaseWifiService {
                 try {
                     packageInfo = pm.getPackageInfo(pkgName, 0);
                 } catch (PackageManager.NameNotFoundException e) {
-                    Log.e(TAG, "Couldn't get PackageInfo for package:" + pkgName);
-                    return;
+                    Log.w(TAG, "Couldn't get PackageInfo for package:" + pkgName);
                 }
                 // If package is not removed or disabled, just ignore.
                 if (packageInfo != null
diff --git a/service/java/com/android/server/wifi/WifiShellCommand.java b/service/java/com/android/server/wifi/WifiShellCommand.java
index b5198ddf9..53acd66a0 100644
--- a/service/java/com/android/server/wifi/WifiShellCommand.java
+++ b/service/java/com/android/server/wifi/WifiShellCommand.java
@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit;
  * commands, which is checked using {@link #checkRootPermission()}.
  */
 public class WifiShellCommand extends BasicShellCommandHandler {
+    private static String SHELL_PACKAGE_NAME = "com.android.shell";
     private final ClientModeImpl mClientModeImpl;
     private final WifiLockManager mWifiLockManager;
     private final WifiNetworkSuggestionsManager mWifiNetworkSuggestionsManager;
@@ -361,7 +362,7 @@ public class WifiShellCommand extends BasicShellCommandHandler {
                                         + " or 'disabled'");
                         return -1;
                     }
-                    mWifiService.setWifiEnabled("com.android.shell", enabled);
+                    mWifiService.setWifiEnabled(SHELL_PACKAGE_NAME, enabled);
                     return 0;
                 }
                 case "get-softap-supported-features":
@@ -373,6 +374,9 @@ public class WifiShellCommand extends BasicShellCommandHandler {
                         pw.println("wifi_softap_wpa3_sae_supported");
                     }
                     break;
+                case "wifi-settings-reset":
+                    mWifiService.factoryReset(SHELL_PACKAGE_NAME);
+                    break;
                 default:
                     return handleDefaultCommands(cmd);
             }
@@ -495,6 +499,8 @@ public class WifiShellCommand extends BasicShellCommandHandler {
         pw.println("  get-softap-supported-features");
         pw.println("    Gets softap supported features. Will print 'wifi_softap_acs_supported'");
         pw.println("    and/or 'wifi_softap_wpa3_sae_supported', each on a separate line.");
+        pw.println("  wifi-settings-reset");
+        pw.println("    Initiates wifi settings reset'");
         pw.println();
     }
 }
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 8ecac08bc..935c52fb4 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -3648,7 +3648,8 @@ public class WifiServiceImplTest extends WifiBaseTest {
                                 && filter.hasAction(Intent.ACTION_PACKAGE_CHANGED)));
         int uid = TEST_UID;
         String packageName = TEST_PACKAGE_NAME;
-        when(mPackageManager.getApplicationInfo(TEST_PACKAGE_NAME, 0)).thenReturn(null);
+        doThrow(new PackageManager.NameNotFoundException()).when(mPackageManager)
+                .getApplicationInfo(TEST_PACKAGE_NAME, 0);
         // Send the broadcast
         Intent intent = new Intent(Intent.ACTION_PACKAGE_FULLY_REMOVED);
         intent.putExtra(Intent.EXTRA_UID, uid);