commit ec4f5afbc6d18dbdc87330c545aa92c91dfcef1c
author Dianne Hackborn <hackbod@google.com> Fri Mar 14 16:40:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 16:40:34 2014 +0000
tree 2744eb63dbb3598dc34cdfa742eb6c5a90592a49
parent e2b35ebf245de94e04b77d53e4e06fc3f2ab7ff4
parent 069a51d65c2295cd1677f8bec79a82365ce8a9e7

am 069a51d6: am a7eadfa5: am 468aefd4: am 829b26ee: Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4

* commit '069a51d65c2295cd1677f8bec79a82365ce8a9e7':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4

src/com/android/phone/OutgoingCallBroadcaster.java

diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index 0f6b1e0..1267286 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -464,7 +464,7 @@
             launchedFromUid = -1;
             launchedFromPackage = null;
         }
-        if (appOps.noteOp(AppOpsManager.OP_CALL_PHONE, launchedFromUid, launchedFromPackage)
+        if (appOps.noteOpNoThrow(AppOpsManager.OP_CALL_PHONE, launchedFromUid, launchedFromPackage)
                 != AppOpsManager.MODE_ALLOWED) {
             Log.w(TAG, "Rejecting call from uid " + launchedFromUid + " package "
                     + launchedFromPackage);