commit 88c21d596a00f2c17c811a43c010dfe3ad843026
author Andreas Huber <andih@google.com> Fri Sep 09 15:56:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 09 15:56:30 2016 +0000
tree eb080e16f299fe49e49fa63f382cbac270e1bdb4
parent 24bd141ce05671a5c5fc338633aa6d4fa30a0052
parent 077678590f5e5569fb1bfc1514a7ee5b28996e3e

Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated."
am: 077678590f

Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index ebb9601..6243f46 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -405,15 +405,8 @@
      */
     public static final int TRANSPORT_VPN = 4;
 
-    /**
-     * Indicates this network uses a Wi-Fi NAN transport.
-     *
-     * @hide PROPOSED_NAN_API
-     */
-    public static final int TRANSPORT_WIFI_NAN = 5;
-
     private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
-    private static final int MAX_TRANSPORT = TRANSPORT_WIFI_NAN;
+    private static final int MAX_TRANSPORT = TRANSPORT_VPN;
 
     /**
      * Adds the given transport type to this {@code NetworkCapability} instance.
@@ -869,7 +862,6 @@
                 case TRANSPORT_BLUETOOTH:   transports += "BLUETOOTH"; break;
                 case TRANSPORT_ETHERNET:    transports += "ETHERNET"; break;
                 case TRANSPORT_VPN:         transports += "VPN"; break;
-                case TRANSPORT_WIFI_NAN:    transports += "WIFI_NAN"; break;
             }
             if (++i < types.length) transports += "|";
         }

core/java/com/android/internal/util/WakeupMessage.java

diff --git a/core/java/com/android/internal/util/WakeupMessage.java b/core/java/com/android/internal/util/WakeupMessage.java
index 7d222c7..2653745 100644
--- a/core/java/com/android/internal/util/WakeupMessage.java
+++ b/core/java/com/android/internal/util/WakeupMessage.java
@@ -45,32 +45,24 @@
     protected final String mCmdName;
     @VisibleForTesting
     protected final int mCmd, mArg1, mArg2;
-    @VisibleForTesting
-    protected final Object mObj;
     private boolean mScheduled;
 
     public WakeupMessage(Context context, Handler handler,
-            String cmdName, int cmd, int arg1, int arg2, Object obj) {
+            String cmdName, int cmd, int arg1, int arg2) {
         mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         mHandler = handler;
         mCmdName = cmdName;
         mCmd = cmd;
         mArg1 = arg1;
         mArg2 = arg2;
-        mObj = obj;
     }
 
     public WakeupMessage(Context context, Handler handler, String cmdName, int cmd, int arg1) {
-        this(context, handler, cmdName, cmd, arg1, 0, null);
-    }
-
-    public WakeupMessage(Context context, Handler handler,
-            String cmdName, int cmd, int arg1, int arg2) {
-        this(context, handler, cmdName, cmd, arg1, arg2, null);
+        this(context, handler, cmdName, cmd, arg1, 0);
     }
 
     public WakeupMessage(Context context, Handler handler, String cmdName, int cmd) {
-        this(context, handler, cmdName, cmd, 0, 0, null);
+        this(context, handler, cmdName, cmd, 0, 0);
     }
 
     /**
@@ -107,7 +99,7 @@
             mScheduled = false;
         }
         if (stillScheduled) {
-            Message msg = mHandler.obtainMessage(mCmd, mArg1, mArg2, mObj);
+            Message msg = mHandler.obtainMessage(mCmd, mArg1, mArg2);
             mHandler.handleMessage(msg);
             msg.recycle();
         }

core/tests/utiltests/src/com/android/internal/util/WakeupMessageTest.java

diff --git a/core/tests/utiltests/src/com/android/internal/util/WakeupMessageTest.java b/core/tests/utiltests/src/com/android/internal/util/WakeupMessageTest.java
index 7935880..da8bc1d 100644
--- a/core/tests/utiltests/src/com/android/internal/util/WakeupMessageTest.java
+++ b/core/tests/utiltests/src/com/android/internal/util/WakeupMessageTest.java
@@ -45,7 +45,6 @@
     private static final int TEST_CMD = 18;
     private static final int TEST_ARG1 = 33;
     private static final int TEST_ARG2 = 182;
-    private static final Object TEST_OBJ = "hello";
 
     @Mock AlarmManager mAlarmManager;
     WakeupMessage mMessage;
@@ -93,7 +92,7 @@
                 mListenerCaptor.capture(), any(Handler.class));
 
         mMessage = new WakeupMessage(context, mHandler, TEST_CMD_NAME, TEST_CMD, TEST_ARG1,
-                TEST_ARG2, TEST_OBJ);
+                TEST_ARG2);
     }
 
     /**
@@ -115,7 +114,6 @@
         assertEquals("what", TEST_CMD, mHandler.getLastMessage().what);
         assertEquals("arg1", TEST_ARG1, mHandler.getLastMessage().arg1);
         assertEquals("arg2", TEST_ARG2, mHandler.getLastMessage().arg2);
-        assertEquals("obj", TEST_OBJ, mHandler.getLastMessage().obj);
     }
 
     /**