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

Commit d0b6ea13 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined. 

am: 87c5855e

Change-Id: Ibf1e8dce145906729c13c5df7942c5055b86e3e6
parents 3f7d5b64 87c5855e

core/java/android/app/SystemServiceRegistry.java

+2 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,8 @@ final class SystemServiceRegistry { 
            @Override

            public AppPredictionManager createService(ContextImpl ctx)

                    throws ServiceNotFoundException {

                return new AppPredictionManager(ctx);

                IBinder b = ServiceManager.getService(Context.APP_PREDICTION_SERVICE);

                return b == null ? null : new AppPredictionManager(ctx);

            }

        });

core/java/android/content/Context.java

+3 −0
Original line number Diff line number Diff line
@@ -4106,6 +4106,9 @@ public abstract class Context { 
    /**

     * Official published name of the app prediction service.

     *

     * <p><b>NOTE: </b> this service is optional; callers of

     * {@code Context.getSystemServiceName(APP_PREDICTION_SERVICE)} should check for {@code null}.

     *

     * @hide

     * @see #getSystemService(String)

     */