Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes If834d0f0,I05ec75c7 into pi-dev

Browse Source 
* changes:
  Add null check for vrManager
  Add null check for vrManager
This commit is contained in:
TreeHugger Robot
2018-10-11 03:17:18 +00:00
committed by Android (Google) Code Review
parent dd7047b4e8 47a17eb077
commit 6d61113df4
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/android/os/SetPersistentVrThreadTest.java
View File

@@ -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,9 +75,11 @@ public class SetPersistentVrThreadTest extends ActivityInstrumentationTestCase2<
}
private void setPersistentVrModeEnabled(boolean enable) throws Throwable {
mVrManager.setPersistentVrModeEnabled(enable);
// Allow the system time to send out callbacks for persistent VR mode.
Thread.sleep(200);
if (mVrManager != null) {
mVrManager.setPersistentVrModeEnabled(enable);
// Allow the system time to send out callbacks for persistent VR mode.
Thread.sleep(200);
}
}
@SmallTest

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

@@ -759,10 +759,12 @@ public class StatusBar extends SystemUI implements DemoMode,
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
Context.VR_SERVICE));
try {
vrManager.registerListener(mVrStateCallbacks);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to register VR mode state listener: " + e);
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(