From b98925df5c620231c0f1a50859267a3c89b494b8 Mon Sep 17 00:00:00 2001
From: Bohdan Petrivskyy <bpetrivs@google.com>
Date: Thu, 6 Feb 2020 17:40:08 +0000
Subject: [PATCH] Fixes "package doesn't belong to uid" exception for
 DeviceConfig clients calling DeviceConfig's access methods as root or shell.

Test: manually tested

Bug: 148801653

Change-Id: I2fdc84a0dbe84ffd3eeb5e994f14c7f5fd8d8b69
---
 .../src/com/android/providers/settings/SettingsProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index c969bfd193b54..7b518a6167b77 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2193,7 +2193,7 @@ public class SettingsProvider extends ContentProvider {
         if (prefix == null) {
             return;
         }
-        String callingPackage = getCallingPackage();
+        String callingPackage = resolveCallingPackage();
         String namespace = prefix.replace("/", "");
         if (DeviceConfig.getPublicNamespaces().contains(namespace)) {
             return;