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

Merge "Catch all exceptions from installd, log codes." am: 9a10ca3f4c

Browse Source 
am: 6f7b136b40

Change-Id: Ia62a8a11907fe5dd4e524fbe181a094500248850
This commit is contained in:
Jeff Sharkey
2016-12-12 19:48:53 +00:00
committed by android-build-merger
parent 228793a0c9 6f7b136b40
commit 5226bbb5a6
2 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/ServiceSpecificException.java
View File

@@ -39,4 +39,9 @@ public class ServiceSpecificException extends RuntimeException {
public ServiceSpecificException(int errorCode) { public ServiceSpecificException(int errorCode) {
this.errorCode = errorCode; this.errorCode = errorCode;
} }
@Override
public String toString() {
return super.toString() + " (code " + errorCode + ")";
}
} }

54
services/core/java/com/android/server/pm/Installer.java
View File

@@ -21,9 +21,7 @@ import android.content.Context;
import android.content.pm.PackageStats; import android.content.pm.PackageStats;
import android.os.Build; import android.os.Build;
import android.os.IInstalld; import android.os.IInstalld;
import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.ServiceSpecificException;
import android.util.Slog; import android.util.Slog;
import com.android.server.SystemService; import com.android.server.SystemService;
@@ -113,7 +111,7 @@ public class Installer extends SystemService {
try { try {
mInstalld.createAppData(uuid, packageName, userId, flags, appId, seInfo, mInstalld.createAppData(uuid, packageName, userId, flags, appId, seInfo,
targetSdkVersion); targetSdkVersion);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -123,7 +121,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.restoreconAppData(uuid, packageName, userId, flags, appId, seInfo); mInstalld.restoreconAppData(uuid, packageName, userId, flags, appId, seInfo);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -133,7 +131,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.migrateAppData(uuid, packageName, userId, flags); mInstalld.migrateAppData(uuid, packageName, userId, flags);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -143,7 +141,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.clearAppData(uuid, packageName, userId, flags, ceDataInode); mInstalld.clearAppData(uuid, packageName, userId, flags, ceDataInode);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -153,7 +151,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.destroyAppData(uuid, packageName, userId, flags, ceDataInode); mInstalld.destroyAppData(uuid, packageName, userId, flags, ceDataInode);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -165,7 +163,7 @@ public class Installer extends SystemService {
try { try {
mInstalld.moveCompleteApp(fromUuid, toUuid, packageName, dataAppName, appId, seInfo, mInstalld.moveCompleteApp(fromUuid, toUuid, packageName, dataAppName, appId, seInfo,
targetSdkVersion); targetSdkVersion);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -179,7 +177,7 @@ public class Installer extends SystemService {
stats.codeSize += res[0]; stats.codeSize += res[0];
stats.dataSize += res[1]; stats.dataSize += res[1];
stats.cacheSize += res[2]; stats.cacheSize += res[2];
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -189,7 +187,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return -1; if (!checkBeforeRemote()) return -1;
try { try {
return mInstalld.getAppDataInode(uuid, packageName, userId, flags); return mInstalld.getAppDataInode(uuid, packageName, userId, flags);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -203,7 +201,7 @@ public class Installer extends SystemService {
try { try {
mInstalld.dexopt(apkPath, uid, pkgName, instructionSet, dexoptNeeded, outputPath, mInstalld.dexopt(apkPath, uid, pkgName, instructionSet, dexoptNeeded, outputPath,
dexFlags, compilerFilter, volumeUuid, sharedLibraries); dexFlags, compilerFilter, volumeUuid, sharedLibraries);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -212,7 +210,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return false; if (!checkBeforeRemote()) return false;
try { try {
return mInstalld.mergeProfiles(uid, packageName); return mInstalld.mergeProfiles(uid, packageName);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -222,7 +220,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return false; if (!checkBeforeRemote()) return false;
try { try {
return mInstalld.dumpProfiles(uid, packageName, codePaths); return mInstalld.dumpProfiles(uid, packageName, codePaths);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -232,7 +230,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.idmap(targetApkPath, overlayApkPath, uid); mInstalld.idmap(targetApkPath, overlayApkPath, uid);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -242,7 +240,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.rmdex(codePath, instructionSet); mInstalld.rmdex(codePath, instructionSet);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -251,7 +249,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.rmPackageDir(packageDir); mInstalld.rmPackageDir(packageDir);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -260,7 +258,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.clearAppProfiles(packageName); mInstalld.clearAppProfiles(packageName);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -269,7 +267,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.destroyAppProfiles(packageName); mInstalld.destroyAppProfiles(packageName);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -279,7 +277,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.createUserData(uuid, userId, userSerial, flags); mInstalld.createUserData(uuid, userId, userSerial, flags);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -288,7 +286,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.destroyUserData(uuid, userId, flags); mInstalld.destroyUserData(uuid, userId, flags);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -298,7 +296,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.markBootComplete(instructionSet); mInstalld.markBootComplete(instructionSet);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -307,7 +305,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.freeCache(uuid, freeStorageSize); mInstalld.freeCache(uuid, freeStorageSize);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -322,7 +320,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.linkNativeLibraryDirectory(uuid, packageName, nativeLibPath32, userId); mInstalld.linkNativeLibraryDirectory(uuid, packageName, nativeLibPath32, userId);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -332,7 +330,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.createOatDir(oatDir, dexInstructionSet); mInstalld.createOatDir(oatDir, dexInstructionSet);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -342,7 +340,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.linkFile(relativePath, fromBase, toBase); mInstalld.linkFile(relativePath, fromBase, toBase);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -352,7 +350,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.moveAb(apkPath, instructionSet, outputPath); mInstalld.moveAb(apkPath, instructionSet, outputPath);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -362,7 +360,7 @@ public class Installer extends SystemService {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.deleteOdex(apkPath, instructionSet, outputPath); mInstalld.deleteOdex(apkPath, instructionSet, outputPath);
} catch (RemoteException | ServiceSpecificException e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }
} }
@@ -383,7 +381,7 @@ public class Installer extends SystemService {
} }
public static InstallerException from(Exception e) throws InstallerException { public static InstallerException from(Exception e) throws InstallerException {
throw new InstallerException(e.getMessage()); throw new InstallerException(e.toString());
} }
} }
} }