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

Use the Context name to publish and use vrmanager

Browse Source 
Bug: 34736524
Test: build
Change-Id: I8aabb4d242fb2378b24dd30a972c382a7f8f4934
This commit is contained in:
Craig Donner
2017-02-07 18:10:32 -08:00
parent 697221e84d
commit 8deb67cb64
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
View File

@@ -295,8 +295,10 @@ public class BrightnessController implements ToggleSlider.Listener {
mAutomaticAvailable = context.getResources().getBoolean(
com.android.internal.R.bool.config_automatic_brightness_available);
mPower = IPowerManager.Stub.asInterface(ServiceManager.getService("power"));
mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));
mPower = IPowerManager.Stub.asInterface(ServiceManager.getService(
Context.POWER_SERVICE));
mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
Context.VR_SERVICE));
}
public void addStateChangedCallback(BrightnessStateChangeCallback cb) {

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

@@ -894,7 +894,8 @@ public class StatusBar extends SystemUI implements DemoMode,
null, null);
updateCurrentProfilesCache();
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
Context.VR_SERVICE));
try {
vrManager.registerListener(mVrStateCallbacks);
} catch (RemoteException e) {

3
services/core/java/com/android/server/UiModeManagerService.java
View File

@@ -772,7 +772,8 @@ final class UiModeManagerService extends SystemService {
}
private void registerVrStateListener() {
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));
IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
Context.VR_SERVICE));
try {
if (vrManager != null) {
vrManager.registerListener(mVrStateCallbacks);

3
services/core/java/com/android/server/display/NightDisplayService.java
View File

@@ -141,8 +141,7 @@ public final class NightDisplayService extends SystemService
@Override
public void onBootPhase(int phase) {
if (phase == PHASE_SYSTEM_SERVICES_READY) {
IVrManager vrManager =
(IVrManager) getBinderService(VrManagerService.VR_MANAGER_BINDER_SERVICE);
IVrManager vrManager = (IVrManager) getBinderService(Context.VR_SERVICE);
if (vrManager != null) {
try {
vrManager.registerListener(mVrStateCallbacks);

2
services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java
View File

@@ -125,7 +125,7 @@ public class ImmersiveModeConfirmation {
void systemReady() {
IVrManager vrManager = IVrManager.Stub.asInterface(
ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));
ServiceManager.getService(Context.VR_SERVICE));
if (vrManager != null) {
try {
vrManager.registerListener(mVrStateCallbacks);

3
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -732,8 +732,7 @@ public final class PowerManagerService extends SystemService
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.DOUBLE_TAP_TO_WAKE),
false, mSettingsObserver, UserHandle.USER_ALL);
IVrManager vrManager =
(IVrManager) getBinderService(VrManagerService.VR_MANAGER_BINDER_SERVICE);
IVrManager vrManager = (IVrManager) getBinderService(Context.VR_SERVICE);
if (vrManager != null) {
try {
vrManager.registerListener(mVrStateCallbacks);

6
services/core/java/com/android/server/vr/VrManagerService.java
View File

@@ -89,8 +89,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC
public static final String TAG = "VrManagerService";
public static final String VR_MANAGER_BINDER_SERVICE = "vrmanager";
private static final int PENDING_STATE_DELAY_MS = 300;
private static final int EVENT_LOG_SIZE = 32;
private static final int INVALID_APPOPS_MODE = -1;
@@ -377,7 +375,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC
@Override
public void setPersistentVrModeEnabled(boolean enabled) {
enforceCallerPermission(Manifest.permission.ACCESS_VR_MANAGER);
enforceCallerPermission(Manifest.permission.RESTRICTED_VR_ACCESS);
VrManagerService.this.setPersistentVrModeEnabled(enabled);
}
@@ -487,7 +485,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC
}
publishLocalService(VrManagerInternal.class, new LocalService());
publishBinderService(VR_MANAGER_BINDER_SERVICE, mVrManager.asBinder());
publishBinderService(Context.VR_SERVICE, mVrManager.asBinder());
}
@Override