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

Commit 6d61113d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes If834d0f0,I05ec75c7 into pi-dev 

* changes:
  Add null check for vrManager
  Add null check for vrManager
parents dd7047b4 47a17eb0

core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java

+5 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.Process; 
import android.provider.Settings;

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Log;



/**

 * Tests ActivityManager#setPersistentVrThread and ActivityManager#setVrThread's
@@ -76,10 +75,12 @@ public class SetPersistentVrThreadTest extends ActivityInstrumentationTestCase2< 
    }



    private void setPersistentVrModeEnabled(boolean enable) throws Throwable {

        if (mVrManager != null) {

            mVrManager.setPersistentVrModeEnabled(enable);

            // Allow the system time to send out callbacks for persistent VR mode.

            Thread.sleep(200);

        }

    }



    @SmallTest

    public void testSetPersistentVrThreadAPISuccess() throws Throwable {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+6 −4
Original line number Diff line number Diff line
@@ -759,11 +759,13 @@ public class StatusBar extends SystemUI implements DemoMode, 


        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

                Context.VR_SERVICE));

        if (vrManager != null) {

            try {

                vrManager.registerListener(mVrStateCallbacks);

            } catch (RemoteException e) {

                Slog.e(TAG, "Failed to register VR mode state listener: " + e);

            }

        }



        IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(

                ServiceManager.getService(Context.WALLPAPER_SERVICE));