From 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 29 Jul 2015 15:20:21 -0700
Subject: Change MNC codename to just M.

Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
---
 core/java/android/os/Build.java       | 2 +-
 core/java/android/os/UserManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/java/android/os')

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index b2ced7f..a0162f7 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -622,7 +622,7 @@ public class Build {
         /**
          * M comes after L.
          */
-        public static final int MNC = 23;
+        public static final int M = 23;
     }
 
     /** The type of build, like "user" or "eng". */
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 79fb805..83a1993 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -180,7 +180,7 @@ public class UserManager {
      * Specifies if a user is disallowed from configuring VPN.
      * The default value is <code>false</code>.
      * This restriction has an effect in a managed profile only from
-     * {@link android.os.Build.VERSION_CODES#MNC}
+     * {@link android.os.Build.VERSION_CODES#M}
      *
      * <p/>Key for user restrictions.
      * <p/>Type: Boolean
-- 
cgit v1.1