Remove PO support from HardwarePropertiesManager
Removed broken profile owner support from HardwarePropertiesManager and
documentation.
Bug: 32945942
Test: compile
Change-Id: Ie5a26a4c94c35f6d894eff57c996552406ddd723
diff --git a/services/core/java/com/android/server/HardwarePropertiesManagerService.java b/services/core/java/com/android/server/HardwarePropertiesManagerService.java
index 36a16cd..e03a478 100644
--- a/services/core/java/com/android/server/HardwarePropertiesManagerService.java
+++ b/services/core/java/com/android/server/HardwarePropertiesManagerService.java
@@ -82,9 +82,9 @@
*
* @param callingPackage The calling package name.
*
- * @throws SecurityException if something other than the profile or device owner, the
- * current VR service, or a caller holding the {@link Manifest.permission#DEVICE_POWER}
- * permission tries to retrieve information provided by this service.
+ * @throws SecurityException if something other than the device owner, the current VR service,
+ * or a caller holding the {@link Manifest.permission#DEVICE_POWER} permission tries to
+ * retrieve information provided by this service.
*/
private void enforceHardwarePropertiesRetrievalAllowed(String callingPackage)
throws SecurityException {
@@ -102,12 +102,12 @@
final int userId = UserHandle.getUserId(uid);
final VrManagerInternal vrService = LocalServices.getService(VrManagerInternal.class);
final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
- if (!dpm.isDeviceOwnerApp(callingPackage) && !dpm.isProfileOwnerApp(callingPackage)
+ if (!dpm.isDeviceOwnerApp(callingPackage)
&& !vrService.isCurrentVrListener(callingPackage, userId)
&& mContext.checkCallingOrSelfPermission(Manifest.permission.DEVICE_POWER)
!= PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("The caller is not a device or profile owner, bound "
- + "VrListenerService, or holding the DEVICE_POWER permission.");
+ throw new SecurityException("The caller is not a device owner, bound VrListenerService"
+ + ", or holding the DEVICE_POWER permission.");
}
}
}