test

Android.mk

@@ -101,10 +101,12 @@ LOCAL_SRC_FILES += \
 	core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
 	core/java/android/bluetooth/IBluetoothPbap.aidl \
 	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
+	core/java/android/bluetooth/IBluetoothHandsfreeClient.aidl \
 	core/java/android/bluetooth/IBluetoothGatt.aidl \
 	core/java/android/bluetooth/IBluetoothGattCallback.aidl \
 	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
 	core/java/android/bluetooth/IBluetoothSap.aidl \
+	core/java/android/bluetooth/IBluetoothDun.aidl \
 	core/java/android/content/IClipboard.aidl \
 	core/java/android/content/IContentService.aidl \
 	core/java/android/content/IIntentReceiver.aidl \
@@ -121,8 +123,10 @@ LOCAL_SRC_FILES += \
 	core/java/android/content/pm/IPackageStatsObserver.aidl \
 	core/java/android/database/IContentObserver.aidl \
 	core/java/android/hardware/ISerialManager.aidl \
+	core/java/android/hardware/display/IDisplayDevice.aidl \
 	core/java/android/hardware/display/IDisplayManager.aidl \
 	core/java/android/hardware/display/IDisplayManagerCallback.aidl \
+	core/java/android/hardware/display/IRemoteDisplayAdapter.aidl \
 	core/java/android/hardware/input/IInputManager.aidl \
 	core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
 	core/java/android/hardware/location/IGeofenceHardware.aidl \
@@ -154,6 +158,7 @@ LOCAL_SRC_FILES += \
 	core/java/android/service/notification/INotificationListener.aidl \
 	core/java/android/service/dreams/IDreamManager.aidl \
 	core/java/android/service/dreams/IDreamService.aidl \
+	core/java/android/service/gesture/IGestureService.aidl \
 	core/java/android/service/pie/IPieService.aidl \
 	core/java/android/service/pie/IPieActivationListener.aidl \
 	core/java/android/service/pie/IPieHostCallback.aidl \
@@ -236,9 +241,12 @@ LOCAL_SRC_FILES += \
 	media/java/android/media/IRingtonePlayer.aidl \
 	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \
 	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
+	telephony/java/com/android/internal/telephony/msim/IPhoneSubInfoMSim.aidl \
 	telephony/java/com/android/internal/telephony/ITelephony.aidl \
+	telephony/java/com/android/internal/telephony/msim/ITelephonyMSim.aidl \
 	telephony/java/com/android/internal/telephony/ISms.aidl \
 	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
+	telephony/java/com/android/internal/telephony/ITelephonyRegistryMSim.aidl \
 	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
 	wifi/java/android/net/wifi/IWifiManager.aidl \
 	wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
@@ -350,7 +358,9 @@ aidl_files := \
 	frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
 	frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
 	frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
+	frameworks/base/telephony/java/com/android/internal/telephony/msim/IPhoneSubInfoMSim.aidl \
 	frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \
+	frameworks/base/telephony/java/com/android/internal/telephony/msim/ITelephonyMSim.aidl \
 
 gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
 $(gen): PRIVATE_SRC_FILES := $(aidl_files)

api/current.txt

@@ -208,6 +208,7 @@ package android {
     ctor public R.array();
     field public static final int emailAddressTypes = 17235968; // 0x1070000
     field public static final int imProtocols = 17235969; // 0x1070001
+    field public static final int networkAttributes = 17235989; // 0x1070015
     field public static final int organizationTypes = 17235970; // 0x1070002
     field public static final int phoneTypes = 17235971; // 0x1070003
     field public static final int postalAddressTypes = 17235972; // 0x1070004

cmds/input/src/com/android/commands/input/Input.java

@@ -78,13 +78,15 @@ private void run(String[] args) {
                     return;
                 }
             } else if (command.equals("touchscreen") || command.equals("touchpad")
-                    || command.equals("touchnavigation")) {
+                    || command.equals("touchnavigation") || command.equals("gesture")) {
                 // determine input source
                 int inputSource = InputDevice.SOURCE_TOUCHSCREEN;
                 if (command.equals("touchpad")) {
                     inputSource = InputDevice.SOURCE_TOUCHPAD;
                 } else if (command.equals("touchnavigation")) {
                     inputSource = InputDevice.SOURCE_TOUCH_NAVIGATION;
+                } else if (command.equals("gesture")) {
+                    inputSource = InputDevice.SOURCE_GESTURE_SENSOR;
                 }
                 // determine subcommand
                 if (args.length > 1) {

cmds/svc/src/com/android/commands/svc/WifiCommand.java

@@ -65,7 +65,7 @@ public void run(String[] args) {
                 IWifiManager wifiMgr
                         = IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
                 try {
-                    wifiMgr.setWifiEnabled(flag);
+                    wifiMgr.setWifiEnabled("com.android.commands.svc", flag);
                 }
                 catch (RemoteException e) {
                     System.err.println("Wi-Fi operation failed: " + e);
@@ -75,4 +75,4 @@ public void run(String[] args) {
         }
         System.err.println(longHelp());
     }
-}
+}

core/java/android/app/AppOpsManager.java

@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,6 +62,7 @@ public class AppOpsManager {
     public static final int MODE_ALLOWED = 0;
     public static final int MODE_IGNORED = 1;
     public static final int MODE_ERRORED = 2;
+    public static final int MODE_ASK     = 3;
 
     // when adding one of these:
     //  - increment _NUM_OP
@@ -97,7 +101,55 @@ public class AppOpsManager {
     public static final int OP_READ_CLIPBOARD = 29;
     public static final int OP_WRITE_CLIPBOARD = 30;
     /** @hide */
-    public static final int _NUM_OP = 31;
+    public static final int OP_WIFI_CHANGE = 31;
+    public static final int OP_BLUETOOTH_CHANGE = 32;
+    public static final int OP_DATA_CONNECT_CHANGE = 33;
+    public static final int OP_ALARM_WAKEUP = 34;
+    public static final int _NUM_OP = 35;
+
+    /**
+     * Map to check if each operation is strict or not, to determine default
+     * value of each operation.
+     * If strict then AppOpsService should assign MODE_ASK value to operation
+     * by default.
+     */
+    private static boolean[] sOpStrict = new boolean[] {
+        true,   //OP_COARSE_LOCATION
+        true,   //OP_FINE_LOCATION
+        true,   //OP_GPS
+        false,  //OP_VIBRATE
+        true,   //OP_READ_CONTACTS
+        true,   //OP_WRITE_CONTACTS
+        true,   //OP_READ_CALL_LOG
+        true,   //OP_WRITE_CALL_LOG
+        false,  //OP_READ_CALENDAR
+        false,  //OP_WRITE_CALENDAR
+        true,   //OP_WIFI_SCAN
+        false,  //OP_POST_NOTIFICATION
+        false,  //OP_NEIGHBORING_CELLS
+        true,   //OP_CALL_PHONE
+        true,   //OP_READ_SMS
+        true,   //OP_WRITE_SMS
+        true,   //OP_RECEIVE_SMS
+        false,  //OP_RECEIVE_EMERGECY_SMS
+        true,   //OP_RECEIVE_MMS
+        false,  //OP_RECEIVE_WAP_PUSH
+        true,   //OP_SEND_SMS
+        true,   //OP_READ_ICC_SMS
+        true,   //OP_WRITE_ICC_SMS
+        false,  //OP_WRITE_SETTINGS
+        false,  //OP_SYSTEM_ALERT_WINDOW
+        false,  //OP_ACCESS_NOTIFICATIONS
+        true,   //OP_CAMERA
+        true,   //OP_RECORD_AUDIO
+        true,   //OP_PLAY_AUDIO
+        false,  //OP_READ_CLIPBOARD
+        false,  //OP_WRITE_CLIPBOARD
+        true,   //OP_WIFI_CHANGE
+        true,   //OP_BLUETOOTH_CHANGE
+        true,   //OP_DATA_CONNECT_CHANGE
+        false,  //OP_ALARM_WAKEUP
+    };
 
     /**
      * This maps each operation to the operation that serves as the
@@ -139,6 +191,10 @@ public class AppOpsManager {
             OP_PLAY_AUDIO,
             OP_READ_CLIPBOARD,
             OP_WRITE_CLIPBOARD,
+            OP_WIFI_CHANGE,
+            OP_BLUETOOTH_CHANGE,
+            OP_DATA_CONNECT_CHANGE,
+            OP_ALARM_WAKEUP,
     };
 
     /**
@@ -177,6 +233,10 @@ public class AppOpsManager {
             "PLAY_AUDIO",
             "READ_CLIPBOARD",
             "WRITE_CLIPBOARD",
+            "WIFI_CHANGE",
+            "BLUETOOTH_CHANGE",
+            "DATA_CONNECT_CHANGE",
+            "ALARM_WAKEUP",
     };
 
     /**
@@ -215,8 +275,19 @@ public class AppOpsManager {
             null, // no permission for playing audio
             null, // no permission for reading clipboard
             null, // no permission for writing clipboard
+            android.Manifest.permission.CHANGE_WIFI_STATE,
+            android.Manifest.permission.BLUETOOTH,
+            android.Manifest.permission.CHANGE_NETWORK_STATE,
+            null, // no permission for alarm wakeups
     };
 
+    /**
+     * Check if given operation is strict or not.
+     */
+    public static boolean opStrict(int op) {
+        return sOpStrict[op];
+    }
+
     /**
      * Retrieve the op switch that controls the given operation.
      */
@@ -232,6 +303,18 @@ public static String opToName(int op) {
         return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")");
     }
 
+    /**
+     * Map a non-localized name for the operation back to the Op number
+     */
+    public static int nameToOp(String name) {
+        for (int i = 0; i < sOpNames.length; i++) {
+            if (sOpNames[i].equals(name)) {
+                return i;
+            }
+        }
+        return OP_NONE;
+    }
+
     /**
      * Retrieve the permission associated with an operation, or null if there is not one.
      */
@@ -310,13 +393,18 @@ public static class OpEntry implements Parcelable {
         private final long mTime;
         private final long mRejectTime;
         private final int mDuration;
+        private final int mAllowedCount;
+        private final int mIgnoredCount;
 
-        public OpEntry(int op, int mode, long time, long rejectTime, int duration) {
+        public OpEntry(int op, int mode, long time, long rejectTime, int duration,
+                int allowedCount, int ignoredCount) {
             mOp = op;
             mMode = mode;
             mTime = time;
             mRejectTime = rejectTime;
             mDuration = duration;
+            mAllowedCount = allowedCount;
+            mIgnoredCount = ignoredCount;
         }
 
         public int getOp() {
@@ -343,6 +431,14 @@ public int getDuration() {
             return mDuration == -1 ? (int)(System.currentTimeMillis()-mTime) : mDuration;
         }
 
+        public int getAllowedCount() {
+            return mAllowedCount;
+        }
+
+        public int getIgnoredCount() {
+            return mIgnoredCount;
+        }
+
         @Override
         public int describeContents() {
             return 0;
@@ -355,6 +451,8 @@ public void writeToParcel(Parcel dest, int flags) {
             dest.writeLong(mTime);
             dest.writeLong(mRejectTime);
             dest.writeInt(mDuration);
+            dest.writeInt(mAllowedCount);
+            dest.writeInt(mIgnoredCount);
         }
 
         OpEntry(Parcel source) {
@@ -363,6 +461,8 @@ public void writeToParcel(Parcel dest, int flags) {
             mTime = source.readLong();
             mRejectTime = source.readLong();
             mDuration = source.readInt();
+            mAllowedCount = source.readInt();
+            mIgnoredCount = source.readInt();
         }
 
         public static final Creator<OpEntry> CREATOR = new Creator<OpEntry>() {
@@ -555,4 +655,11 @@ public void setPrivacyGuardSettingForPackage(int uid, String packageName,
         } catch (RemoteException e) {
         }
     }
+
+    public void resetCounters() {
+        try {
+            mService.resetCounters();
+        } catch (RemoteException e) {
+        }
+    }
 }

core/java/android/app/ContextImpl.java

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2006 The Android Open Source Project
  * This code has been modified.  Portions copyright (C) 2010, T-Mobile USA, Inc.
+ * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,6 +100,7 @@
 import android.os.SystemVibrator;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
+import android.telephony.MSimTelephonyManager;
 import android.telephony.TelephonyManager;
 import android.content.ClipboardManager;
 import android.util.AndroidRuntimeException;
@@ -489,6 +492,13 @@ public Object createService(ContextImpl ctx) {
                     return new TelephonyManager(ctx.getOuterContext());
                 }});
 
+        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {
+            registerService(MSIM_TELEPHONY_SERVICE, new ServiceFetcher() {
+                    public Object createService(ContextImpl ctx) {
+                        return new MSimTelephonyManager(ctx.getOuterContext());
+                    }});
+        }
+
         registerService(UI_MODE_SERVICE, new ServiceFetcher() {
                 public Object createService(ContextImpl ctx) {
                     return new UiModeManager();

core/java/android/bluetooth/BluetoothAdapter.java

@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2013 The Linux Foundation. All rights reserved
+ * Not a Contribution.
  * Copyright (C) 2009 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +20,7 @@
 
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
+import android.app.ActivityThread;
 import android.content.Context;
 import android.os.Binder;
 import android.os.IBinder;
@@ -516,7 +519,7 @@ public boolean enable() {
             return true;
         }
         try {
-            return mManagerService.enable();
+            return mManagerService.enable(ActivityThread.currentPackageName());
         } catch (RemoteException e) {Log.e(TAG, "", e);}
         return false;
     }
@@ -1181,9 +1184,15 @@ public boolean getProfileProxy(Context context, BluetoothProfile.ServiceListener
         } else if (profile == BluetoothProfile.SAP) {
             BluetoothSap sap = new BluetoothSap(context, listener);
             return true;
+        } else if (profile == BluetoothProfile.DUN) {
+            BluetoothDun dun = new BluetoothDun(context, listener);
+            return true;
         } else if (profile == BluetoothProfile.HEALTH) {
             BluetoothHealth health = new BluetoothHealth(context, listener);
             return true;
+        } else if (profile == BluetoothProfile.HANDSFREE_CLIENT) {
+            BluetoothHandsfreeClient hfpclient = new BluetoothHandsfreeClient(context, listener);
+            return true;
         } else {
             return false;
         }
@@ -1224,6 +1233,10 @@ public void closeProfileProxy(int profile, BluetoothProfile proxy) {
                 BluetoothSap sap = (BluetoothSap)proxy;
                 sap.close();
                 break;
+            case BluetoothProfile.DUN:
+                BluetoothDun dun = (BluetoothDun)proxy;
+                dun.close();
+                break;
             case BluetoothProfile.HEALTH:
                 BluetoothHealth health = (BluetoothHealth)proxy;
                 health.close();
@@ -1236,6 +1249,10 @@ public void closeProfileProxy(int profile, BluetoothProfile proxy) {
                 BluetoothGattServer gattServer = (BluetoothGattServer)proxy;
                 gattServer.close();
                 break;
+            case BluetoothProfile.HANDSFREE_CLIENT:
+                BluetoothHandsfreeClient hfpclient = (BluetoothHandsfreeClient)proxy;
+                hfpclient.close();
+                break;
         }
     }