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

Commit d69c5aa7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Make DreamManagerService FBE aware." into nyc-dev am: e0ac8398 

am: fb7ce670

* commit 'fb7ce670':
  Make DreamManagerService FBE aware.

Change-Id: I45e59ee48c617bf4c714c2bed29be5a76c3db865
parents e191eb0c fb7ce670

services/core/java/com/android/server/dreams/DreamManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -335,7 +335,8 @@ public final class DreamManagerService extends SystemService { 




    private ServiceInfo getServiceInfo(ComponentName name) {

    private ServiceInfo getServiceInfo(ComponentName name) {

        try {

        try {

            return name != null ? mContext.getPackageManager().getServiceInfo(name, 0) : null;

            return name != null ? mContext.getPackageManager().getServiceInfo(name,

                    PackageManager.MATCH_DEBUG_TRIAGED_MISSING) : null;

        } catch (NameNotFoundException e) {

        } catch (NameNotFoundException e) {

            return null;

            return null;

        }

        }