am a21a6075: Reconcile with jb-mr1-release

* commit 'a21a60757d7e589ade83129f42aadc019f1d5aa4':
  Fix permission issues for apps

4 files changed, 2 insertions, 33 deletions

diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl
index 4d46334..b7b8731 100644
--- a/core/java/android/net/INetworkStatsService.aidl
+++ b/core/java/android/net/INetworkStatsService.aidl
@@ -45,7 +45,4 @@ interface INetworkStatsService {
     /** Advise persistance threshold; may be overridden internally. */
     void advisePersistThreshold(long thresholdBytes);
 
-    /** Adjust recorded network stats. */
-    void adjustNetworkStats(int uid, int tag, long rxBytes, long rxPackets, long txBytes, long txPackets, long operationCount);
-
 }
diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index b66c2fe..e437d2e 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -88,13 +88,6 @@ public class TrafficStats {
      */
     public static final int TAG_SYSTEM_BACKUP = 0xFFFFFF03;
 
-    /**
-     * Default tag value for cloud messaging traffic.
-     *
-     * @hide
-     */
-    public static final int TAG_SYSTEM_CLOUD_MESSAGING = 0xFFFFFF04;
-
     private static INetworkStatsService sStatsService;
 
     private synchronized static INetworkStatsService getStatsService() {
@@ -253,27 +246,6 @@ public class TrafficStats {
         }
     }
 
-    /**
-     * Adjust network statistics for the given UID and tag by the requested
-     * amount. This can be used to correctly account network usage performed on
-     * behalf of another application. Values can be negative.
-     * <p>
-     * Requires that caller holds
-     * {@link android.Manifest.permission#MODIFY_NETWORK_ACCOUNTING} permission.
-     *
-     * @see #setThreadStatsUid(int)
-     * @hide
-     */
-    public static void adjustNetworkStats(int uid, int tag, long rxBytes, long rxPackets,
-            long txBytes, long txPackets, long operationCount) {
-        try {
-            getStatsService().adjustNetworkStats(
-                    uid, tag, rxBytes, rxPackets, txBytes, txPackets, operationCount);
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     /** {@hide} */
     public static void closeQuietly(INetworkStatsSession session) {
         // TODO: move to NetworkStatsService once it exists
diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index 7e85324..46079f9 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -223,7 +223,7 @@ public class CheckedTextView extends TextView implements Checkable {
             final int bottom = top + height;
             final int left = isLayoutRtl ? getPaddingEnd() : width - getPaddingEnd();
             final int right = left + mCheckMarkWidth;
-            checkMarkDrawable.setBounds(left, top, right, bottom);
+            checkMarkDrawable.setBounds( left, top, right, bottom);
             checkMarkDrawable.draw(canvas);
         }
     }
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 270998f..50670fe 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -699,7 +699,7 @@
     <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Экстренный вызов"</string>
     <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Вернуться к вызову"</string>
     <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правильно!"</string>
-    <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Повторите попытку"</string>
+    <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Повторить попытку"</string>
     <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Повторить попытку"</string>
     <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Все попытки войти с помощью Фейсконтроля использованы"</string>
     <string name="lockscreen_plugged_in" msgid="8057762828355572315">"Идет зарядка (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string>