Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev

Christopher Tate · Android (Google) Code Review · commit c575e007e59e · 2012-09-19T18:35:08.000-07:00
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
@@ -1338,7 +1338,7 @@ public static boolean getShowGTalkServiceStatusForUser(ContentResolver cr,
         /** @deprecated - Do not use */
         @Deprecated
         public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
-            /* intentionally empty */
+            setShowGTalkServiceStatusForUser(cr, flag, UserHandle.myUserId());
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -1338,7 +1338,7 @@ public static boolean getShowGTalkServiceStatusForUser(ContentResolver cr,`
`1338`	`1338`	`/** @deprecated - Do not use */`
`1339`	`1339`	`@Deprecated`
`1340`	`1340`	`public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {`
`1341`		`- /* intentionally empty */`
	`1341`	`+ setShowGTalkServiceStatusForUser(cr, flag, UserHandle.myUserId());`
`1342`	`1342`	`}`
`1343`	`1343`
`1344`	`1344`	`/**`