diff options
| author | Daulet Zhanguzin <dauletz@google.com> | 2019-12-30 15:41:28 +0000 |
|---|---|---|
| committer | Daulet Zhanguzin <dauletz@google.com> | 2019-12-30 15:41:28 +0000 |
| commit | 0af97d60d7abd0b9f0c164fdda84a7ff6d3e7416 (patch) | |
| tree | a1c232d8c767f5749c525177195249ccd6d0e9fc /core/java/android/app/ApplicationPackageManager.java | |
| parent | 7b36ffb06c80b9f1ff66f0e440380589ed60126e (diff) | |
Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull
Bug: 126528330
Test: Treehugger
Change-Id: I42117ebfb640e3b0b133183e5e146860bed8471a
Diffstat (limited to 'core/java/android/app/ApplicationPackageManager.java')
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 7f26565d760a..1c6a5615dbd5 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -100,7 +100,6 @@ import android.view.Display; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.SomeArgs; -import com.android.internal.util.Preconditions; import com.android.internal.util.UserIcons; import dalvik.system.VMRuntime; @@ -2149,7 +2148,7 @@ public class ApplicationPackageManager extends PackageManager { } else if (vol.isPrimaryPhysical()) { volumeUuid = StorageManager.UUID_PRIMARY_PHYSICAL; } else { - volumeUuid = Preconditions.checkNotNull(vol.fsUuid); + volumeUuid = Objects.requireNonNull(vol.fsUuid); } return mPM.movePackage(packageName, volumeUuid); @@ -2259,7 +2258,7 @@ public class ApplicationPackageManager extends PackageManager { } else if (vol.isPrimaryPhysical()) { volumeUuid = StorageManager.UUID_PRIMARY_PHYSICAL; } else { - volumeUuid = Preconditions.checkNotNull(vol.fsUuid); + volumeUuid = Objects.requireNonNull(vol.fsUuid); } return mPM.movePrimaryStorage(volumeUuid); @@ -2661,8 +2660,8 @@ public class ApplicationPackageManager extends PackageManager { /** @hide */ @Override public KeySet getKeySetByAlias(String packageName, String alias) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(alias); + Objects.requireNonNull(packageName); + Objects.requireNonNull(alias); try { return mPM.getKeySetByAlias(packageName, alias); } catch (RemoteException e) { @@ -2673,7 +2672,7 @@ public class ApplicationPackageManager extends PackageManager { /** @hide */ @Override public KeySet getSigningKeySet(String packageName) { - Preconditions.checkNotNull(packageName); + Objects.requireNonNull(packageName); try { return mPM.getSigningKeySet(packageName); } catch (RemoteException e) { @@ -2684,8 +2683,8 @@ public class ApplicationPackageManager extends PackageManager { /** @hide */ @Override public boolean isSignedBy(String packageName, KeySet ks) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(ks); + Objects.requireNonNull(packageName); + Objects.requireNonNull(ks); try { return mPM.isPackageSignedByKeySet(packageName, ks); } catch (RemoteException e) { @@ -2696,8 +2695,8 @@ public class ApplicationPackageManager extends PackageManager { /** @hide */ @Override public boolean isSignedByExactly(String packageName, KeySet ks) { - Preconditions.checkNotNull(packageName); - Preconditions.checkNotNull(ks); + Objects.requireNonNull(packageName); + Objects.requireNonNull(ks); try { return mPM.isPackageSignedByKeySetExactly(packageName, ks); } catch (RemoteException e) { |