Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a95b357 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "VIMS: Clarify NonNullability of PackageMonitor#onPackageModified." into... 

Merge "VIMS: Clarify NonNullability of PackageMonitor#onPackageModified." into sc-dev am: b7fd9a78

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a4d01650b2db7d7ca34a759524ec83b540bb05
parents fd02b36b b7fd9a78

core/java/com/android/internal/content/PackageMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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()) {