Rename "NewGrantPermissionsViewModel" to "GrantPermissionsViewModel

Now that the old viewmodel has been removed, we can rename the new one.

Fixes: 284183336
Test: atest CtsPermissionUiTestCases
Change-Id: I689b88dd659ff8008f1ed1ef054b193530033f50

2 files changed, 11 insertions, 11 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
index 5e41cbaf3..28ec321e7 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
@@ -33,8 +33,8 @@ import static com.android.permissioncontroller.permission.ui.GrantPermissionsVie
 import static com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandler.GRANTED_USER_SELECTED;
 import static com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandler.LINKED_TO_PERMISSION_RATIONALE;
 import static com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandler.LINKED_TO_SETTINGS;
-import static com.android.permissioncontroller.permission.ui.model.NewGrantPermissionsViewModel.APP_PERMISSION_REQUEST_CODE;
-import static com.android.permissioncontroller.permission.ui.model.NewGrantPermissionsViewModel.PHOTO_PICKER_REQUEST_CODE;
+import static com.android.permissioncontroller.permission.ui.model.GrantPermissionsViewModel.APP_PERMISSION_REQUEST_CODE;
+import static com.android.permissioncontroller.permission.ui.model.GrantPermissionsViewModel.PHOTO_PICKER_REQUEST_CODE;
 import static com.android.permissioncontroller.permission.utils.Utils.getRequestMessage;
 
 import android.Manifest;
@@ -78,8 +78,8 @@ import com.android.permissioncontroller.DeviceUtils;
 import com.android.permissioncontroller.R;
 import com.android.permissioncontroller.permission.ui.auto.GrantPermissionsAutoViewHandler;
 import com.android.permissioncontroller.permission.ui.model.DenyButton;
-import com.android.permissioncontroller.permission.ui.model.NewGrantPermissionsViewModel;
-import com.android.permissioncontroller.permission.ui.model.NewGrantPermissionsViewModel.RequestInfo;
+import com.android.permissioncontroller.permission.ui.model.GrantPermissionsViewModel;
+import com.android.permissioncontroller.permission.ui.model.GrantPermissionsViewModel.RequestInfo;
 import com.android.permissioncontroller.permission.ui.model.NewGrantPermissionsViewModelFactory;
 import com.android.permissioncontroller.permission.ui.model.Prompt;
 import com.android.permissioncontroller.permission.ui.wear.GrantPermissionsWearViewHandler;
@@ -171,7 +171,7 @@ public class GrantPermissionsActivity extends SettingsActivity
     private int mRequestCounts = 0;
     private List<RequestInfo> mRequestInfos = new ArrayList<>();
     private GrantPermissionsViewHandler mViewHandler;
-    private NewGrantPermissionsViewModel mViewModel;
+    private GrantPermissionsViewModel mViewModel;
     /**
      * A list of other GrantPermissionActivities for the same package which passed their list of
      * permissions to this one. They need to be informed when this activity finishes.
@@ -303,7 +303,7 @@ public class GrantPermissionsActivity extends SettingsActivity
                     new NewGrantPermissionsViewModelFactory(getApplication(), mTargetPackage,
                             mRequestedPermissions, mSystemRequestedPermissions, mSessionId,
                             icicle);
-            mViewModel = factory.create(NewGrantPermissionsViewModel.class);
+            mViewModel = factory.create(GrantPermissionsViewModel.class);
             mViewModel.getRequestInfosLiveData().observe(this, this::onRequestInfoLoad);
         }
 
@@ -390,7 +390,7 @@ public class GrantPermissionsActivity extends SettingsActivity
         NewGrantPermissionsViewModelFactory factory = new NewGrantPermissionsViewModelFactory(
                 getApplication(), mTargetPackage, mRequestedPermissions,
                 mSystemRequestedPermissions, mSessionId, oldState);
-        mViewModel = factory.create(NewGrantPermissionsViewModel.class);
+        mViewModel = factory.create(GrantPermissionsViewModel.class);
         mViewModel.getRequestInfosLiveData().observe(this, this::onRequestInfoLoad);
         if (follower != null) {
             follower.mViewModel = mViewModel;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/NewGrantPermissionsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt
index 8f2169dfe..478175094 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/NewGrantPermissionsViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt
@@ -129,7 +129,7 @@ import com.android.permissioncontroller.permission.utils.v34.SafetyLabelUtils
  * @param sessionId: A long to identify this session
  * @param storedState: Previous state, if this activity was stopped and is being recreated
  */
-class NewGrantPermissionsViewModel(
+class GrantPermissionsViewModel(
     private val app: Application,
     private val packageName: String,
     private val requestedPermissions: List<String>,
@@ -137,7 +137,7 @@ class NewGrantPermissionsViewModel(
     private val sessionId: Long,
     private val storedState: Bundle?
 ) : ViewModel() {
-    private val LOG_TAG = NewGrantPermissionsViewModel::class.java.simpleName
+    private val LOG_TAG = GrantPermissionsViewModel::class.java.simpleName
     private val user = Process.myUserHandle()
     private val packageInfoLiveData = LightPackageInfoLiveData[packageName, user]
     private val safetyLabelInfoLiveData =
@@ -207,7 +207,7 @@ class NewGrantPermissionsViewModel(
 
     val requestInfosLiveData = object :
         SmartUpdateMediatorLiveData<List<RequestInfo>>() {
-        private val LOG_TAG = NewGrantPermissionsViewModel::class.java.simpleName
+        private val LOG_TAG = GrantPermissionsViewModel::class.java.simpleName
         private val packagePermissionsLiveData = PackagePermissionsLiveData[packageName, user]
 
         init {
@@ -1131,7 +1131,7 @@ class NewGrantPermissionsViewModelFactory(
 ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         @Suppress("UNCHECKED_CAST")
-        return NewGrantPermissionsViewModel(app, packageName, requestedPermissions,
+        return GrantPermissionsViewModel(app, packageName, requestedPermissions,
             systemRequestedPermissions, sessionId, savedState) as T
     }
 }