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

Merge "Cleanup: remove DSS RemoteException references" into rvc-dev am: c1ddf61ca7

Browse Source 
Change-Id: I9102b8615a024e643fd30360512adb606fb19ff9
This commit is contained in:
TreeHugger Robot
2020-04-27 19:59:20 +00:00
committed by Automerger Merge Worker
parent b1f1b2fe92 c1ddf61ca7
commit 41751f7b75
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/DynamicSystemService.java
View File

@@ -51,7 +51,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub {
mContext = context; mContext = context;
} }
private IGsiService getGsiService() throws RemoteException { private IGsiService getGsiService() {
checkPermission(); checkPermission();
if (mGsiService != null) { if (mGsiService != null) {
return mGsiService; return mGsiService;
@@ -60,8 +60,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub {
} }
private void checkPermission() { private void checkPermission() {
if (mContext.checkCallingOrSelfPermission( if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires MANAGE_DYNAMIC_SYSTEM permission"); throw new SecurityException("Requires MANAGE_DYNAMIC_SYSTEM permission");
} }
@@ -147,12 +146,12 @@ public class DynamicSystemService extends IDynamicSystemService.Stub {
} }
@Override @Override
public boolean isInUse() throws RemoteException { public boolean isInUse() {
return SystemProperties.getBoolean("ro.gsid.image_running", false); return SystemProperties.getBoolean("ro.gsid.image_running", false);
} }
@Override @Override
public boolean isInstalled() throws RemoteException { public boolean isInstalled() {
boolean installed = SystemProperties.getBoolean("gsid.image_installed", false); boolean installed = SystemProperties.getBoolean("gsid.image_installed", false);
Slog.i(TAG, "isInstalled(): " + installed); Slog.i(TAG, "isInstalled(): " + installed);
return installed; return installed;