From 8b3b3b9403231d302a35ff60ce80b7944f34ed98 Mon Sep 17 00:00:00 2001
From: Ahaan Ugale <augale@google.com>
Date: Sun, 10 Jan 2021 12:18:23 -0800
Subject: [PATCH] VIMS: Clarify NonNullability of
 PackageMonitor#onPackageModified.

Bug: 178410946
Test: builds
Change-Id: I767e0f7f4ed1ae8c7f0a74afb5114a85a679d86a
---
 core/java/com/android/internal/content/PackageMonitor.java     | 3 ++-
 .../voiceinteraction/VoiceInteractionManagerService.java       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java
index af666d87d6f12..9a44c0594b76a 100644
--- a/core/java/com/android/internal/content/PackageMonitor.java
+++ b/core/java/com/android/internal/content/PackageMonitor.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.content;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
@@ -234,7 +235,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
     /**
      * Called when an existing package is updated or its disabled state changes.
      */
-    public void onPackageModified(String packageName) {
+    public void onPackageModified(@NonNull String packageName) {
     }
     
     public boolean didSomePackagesChange() {
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index c1fb74dc97db7..be36f82cce7d5 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -1782,7 +1782,7 @@ public class VoiceInteractionManagerService extends SystemService {
             }
 
             @Override
-            public void onPackageModified(String pkgName) {
+            public void onPackageModified(@NonNull String pkgName) {
                 // If the package modified is not in the current user, then don't bother making
                 // any changes as we are going to do any initialization needed when we switch users.
                 if (mCurUser != getChangingUserId()) {