PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for sidecar null-ness before removing

Browse Source 
Test: cd tests/robotests && mma
Bug: 36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
This commit is contained in:
Maurice Lam
2017-05-08 21:43:02 -07:00
parent fc8e64eccb
commit e1976ac302
8 changed files with 206 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/Utils.java
View File

@@ -103,6 +103,8 @@ import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.password.FingerprintManagerWrapper;
import com.android.settings.password.IFingerprintManager;
import java.io.IOException;
import java.io.InputStream;
@@ -1197,6 +1199,15 @@ public final class Utils extends com.android.settingslib.Utils {
}
}
public static IFingerprintManager getFingerprintManagerWrapperOrNull(Context context) {
FingerprintManager fingerprintManager = getFingerprintManagerOrNull(context);
if (fingerprintManager != null) {
return new FingerprintManagerWrapper(fingerprintManager);
} else {
return null;
}
}
/**
* Launches an intent which may optionally have a user id defined.
* @param fragment Fragment to use to launch the activity.