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

Merge "Fix issue #25673462: Shamu update from MMB29J -> 29K does not complete"

Browse Source
This commit is contained in:
Dianne Hackborn
2015-11-18 19:07:43 +00:00
committed by Android (Google) Code Review
parent adad4a623c c83189b5d6
commit 32bb7bc314
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/service/voice/VoiceInteractionServiceInfo.java
View File

@@ -52,9 +52,21 @@ public class VoiceInteractionServiceInfo {
}
public VoiceInteractionServiceInfo(PackageManager pm, ComponentName comp, int userHandle)
throws PackageManager.NameNotFoundException, RemoteException {
this(pm, AppGlobals.getPackageManager().getServiceInfo(comp,
PackageManager.GET_META_DATA, userHandle));
throws PackageManager.NameNotFoundException {
this(pm, getServiceInfoOrThrow(comp, userHandle));
}
static ServiceInfo getServiceInfoOrThrow(ComponentName comp, int userHandle)
throws PackageManager.NameNotFoundException {
try {
ServiceInfo si = AppGlobals.getPackageManager().getServiceInfo(comp,
PackageManager.GET_META_DATA, userHandle);
if (si != null) {
return si;
}
} catch (RemoteException e) {
}
throw new PackageManager.NameNotFoundException(comp.toString());
}
public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) {