commit 257e821e89cfd98d9894aaf7291ee79e9677003c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 01 05:03:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 01 05:03:37 2018 +0000
tree 7de5ed7dee7ba1486d7e654fb42e2f216f4c708e
parent e83fee27583dc58cf19173319c0edcab5b5a2c94
parent e649748eb69aad55fa77f43d3f658b2a51db1248

Merge "Parse persist property the legacy way"

services/usb/java/com/android/server/usb/UsbDeviceManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index d3022b4..55ffea6 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -501,8 +501,8 @@
              * Use the normal bootmode persistent prop to maintain state of adb across
              * all boot modes.
              */
-            mAdbEnabled = (UsbManager.usbFunctionsFromString(getSystemProperty(
-                    USB_PERSISTENT_CONFIG_PROPERTY, "")) & UsbManager.FUNCTION_ADB) != 0;
+            mAdbEnabled = UsbHandlerLegacy.containsFunction(getSystemProperty(
+                    USB_PERSISTENT_CONFIG_PROPERTY, ""), UsbManager.USB_FUNCTION_ADB);
 
             // We do not show the USB notification if the primary volume supports mass storage.
             // The legacy mass storage UI will be used instead.
@@ -1607,7 +1607,7 @@
             return persistProp;
         }
 
-        private String addFunction(String functions, String function) {
+        private static String addFunction(String functions, String function) {
             if (UsbManager.USB_FUNCTION_NONE.equals(functions)) {
                 return function;
             }
@@ -1620,7 +1620,7 @@
             return functions;
         }
 
-        private String removeFunction(String functions, String function) {
+        private static String removeFunction(String functions, String function) {
             String[] split = functions.split(",");
             for (int i = 0; i < split.length; i++) {
                 if (function.equals(split[i])) {
@@ -1643,7 +1643,7 @@
             return builder.toString();
         }
 
-        private boolean containsFunction(String functions, String function) {
+        static boolean containsFunction(String functions, String function) {
             int index = functions.indexOf(function);
             if (index < 0) return false;
             if (index > 0 && functions.charAt(index - 1) != ',') return false;