diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-10 23:26:41 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-10 23:26:41 -0800 |
| commit | 5fdfd2cf9277b839fa43d02f445e24f209c91bb6 (patch) | |
| tree | d8737c86c2638fd26c36031ddb7f6a543573bb9c | |
| parent | aed8a684805dbcc0f57e4a087ce7ceef714ebeb3 (diff) | |
| parent | 38800802eefb16549926054429efd7b1a31434c7 (diff) | |
| download | android_packages_apps_InCallUI-5fdfd2cf9277b839fa43d02f445e24f209c91bb6.tar.gz android_packages_apps_InCallUI-5fdfd2cf9277b839fa43d02f445e24f209c91bb6.tar.bz2 android_packages_apps_InCallUI-5fdfd2cf9277b839fa43d02f445e24f209c91bb6.zip | |
Merge "InCallUI: Fix InCallUI crash when making a call in guest mode"
| -rw-r--r-- | src/com/android/incallui/InCallActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index 87cfa064..c9656e80 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -35,6 +35,7 @@ import android.content.res.TypedArray; import android.graphics.Point; import android.net.Uri; import android.os.Bundle; +import android.os.UserHandle; import android.telecom.DisconnectCause; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; @@ -990,7 +991,8 @@ public class InCallActivity extends Activity { } public Bundle callBinder(String method) { - if (getContentResolver().acquireProvider(URI_PHONE_FEATURE) == null) { + if (UserHandle.myUserId() != UserHandle.USER_OWNER || + getContentResolver().acquireProvider(URI_PHONE_FEATURE) == null) { // Check whether phone feature enabled return null; } |