am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit '4b655fd193992afff948df513c7b9b9a0389972e': Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:19:47 +00:00
parent d28991a5e4 4b655fd193
commit 7c3d595a3d
8 changed files with 123 additions and 5 deletions
--- a/telecomm/java/android/telecom/DefaultDialerManager.java
+++ b/telecomm/java/android/telecom/DefaultDialerManager.java
@@ -97,7 +97,7 @@ public class DefaultDialerManager {
     * @hide
     * */
    public static String getDefaultDialerApplication(Context context) {
-        return getDefaultDialerApplication(context, ActivityManager.getCurrentUser());
+        return getDefaultDialerApplication(context, context.getUserId());
    }

    /**