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

Commit 8ff4f48d authored by Zhi Dou's avatar Zhi Dou
Browse files

Clear the calling uid if the call is a binder transaction call 

The method getStringsForPrefix only clear the uid only if the namespace
if for policy manager. But now with tunk flag the binder call will be
more often.

Bug: 300704684
Test: presubmit
Change-Id: I43c325b658ed20d43944c4532d7decd2969cffef
parent 374910ad

core/java/android/provider/Settings.java

+2 −5
Original line number Diff line number Diff line
@@ -3596,12 +3596,9 @@ public final class Settings { 
                }















                Bundle b;













                // b/252663068: if we're in system server and the caller did not call













                // If we're in system server and the caller did not call















                // clearCallingIdentity, the read would fail due to mismatched AttributionSources.













                // TODO(b/256013480): remove this bypass after fixing the callers in system server.













                if (namespace.equals(DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER)













                        && Settings.isInSystemServer()













                        && Binder.getCallingUid() != Process.myUid()) {













                if (Settings.isInSystemServer() && Binder.getCallingUid() != Process.myUid()) {















                    final long token = Binder.clearCallingIdentity();















                    try {















                        // Fetch all flags for the namespace at once for caching purposes