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

Commit fbad94fb authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Camera: Clear identity before access device policy manager" into main... 

Merge "Camera: Clear identity before access device policy manager" into main am: 6cc59823 am: 63827abe

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



Change-Id: I4b398800a92462b0d3b192208296d1c77762ac5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5abd13f5 63827abe

services/core/java/com/android/server/camera/CameraServiceProxy.java

+17 −7
Original line number Diff line number Diff line
@@ -595,6 +595,13 @@ public class CameraServiceProxy extends SystemService 


        @Override

        public boolean isCameraDisabled(int userId) {

            if (Binder.getCallingUid() != Process.CAMERASERVER_UID) {

                Slog.e(TAG, "Calling UID: " + Binder.getCallingUid()

                        + " doesn't match expected camera service UID!");

                return false;

            }

            final long ident = Binder.clearCallingIdentity();

            try {

                DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);

                if (dpm == null) {

                    Slog.e(TAG, "Failed to get the device policy manager service");
@@ -606,6 +613,9 @@ public class CameraServiceProxy extends SystemService 
                    e.printStackTrace();

                    return false;

                }

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

        }

    };