From 5edd9b25418d4c7e109ed3502733766e5472a1dc Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Tue, 31 Dec 2019 14:58:46 -0800
Subject: [PATCH] Fix hidden API usage in PackageChangeReceiver

Use Context#createContextForUser instead of calling
Context#registerReceiverForUser.

Test: atest FrameworksTelephonyTests
Bug: 146834818
Change-Id: Ia239499219218d30d1556007ac4561a5ec44b72f
---
 .../android/internal/telephony/PackageChangeReceiver.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java b/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java
index 922af126e73ef..d4d07ea8e54c8 100644
--- a/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java
+++ b/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java
@@ -56,12 +56,8 @@ public abstract class PackageChangeReceiver extends BroadcastReceiver {
         Handler handler = (thread == null) ? BackgroundThread.getHandler() : new Handler(thread);
         mRegisteredContext = context;
         if (handler != null) {
-            if (user != null) {
-                context.registerReceiverAsUser(this, user, sPackageIntentFilter, null, handler);
-            } else {
-                context.registerReceiver(this, sPackageIntentFilter,
-                        null, handler);
-            }
+            Context contextForUser = user == null ? context : context.createContextAsUser(user, 0);
+            contextForUser.registerReceiver(this, sPackageIntentFilter, null, handler);
         } else {
             throw new NullPointerException();
         }