Merge "Support multi-users for NFC payments"
diff --git a/res/values-mcc234/strings.xml b/res/values-mcc234/strings.xml
new file mode 100644
index 0000000..f7d0d33
--- /dev/null
+++ b/res/values-mcc234/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="cell_broadcast_settings">Emergency alerts</string>
+</resources>
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/OWNERS b/src/com/android/settings/biometrics/OWNERS
index 021e89d..23eaf7e 100644
--- a/src/com/android/settings/biometrics/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,6 +1,9 @@
# Default reviewers for this and subdirectories.
curtislb@google.com
+ilyamaty@google.com
jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
kchyn@google.com
yukl@google.com
diff --git a/src/com/android/settings/bluetooth/OWNERS b/src/com/android/settings/bluetooth/OWNERS
index 5e716e1..52017a8 100644
--- a/src/com/android/settings/bluetooth/OWNERS
+++ b/src/com/android/settings/bluetooth/OWNERS
@@ -2,5 +2,6 @@
hughchen@google.com
timhypeng@google.com
siyuanh@google.com
+robertluo@google.com
# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/connecteddevice/OWNERS b/src/com/android/settings/connecteddevice/OWNERS
new file mode 100644
index 0000000..a5fe957
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/connecteddevice/usb/OWNERS b/src/com/android/settings/connecteddevice/usb/OWNERS
index add985c..66bf468 100644
--- a/src/com/android/settings/connecteddevice/usb/OWNERS
+++ b/src/com/android/settings/connecteddevice/usb/OWNERS
@@ -1,3 +1,6 @@
# Default reviewers for this and subdirectories.
zhangjerry@google.com
badhri@google.com
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
index b9c2d43..3aa92f1 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
@@ -73,7 +73,7 @@
final CharSequence titleFormat = mContext.getText(
R.string.adb_device_fingerprint_title_format);
mFingerprintPref.setTitle(String.format(
- titleFormat.toString(), mPairedDevice.getGuid()));
+ titleFormat.toString(), mPairedDevice.guid));
mFingerprintCategory.addPreference(mFingerprintPref);
}
}
diff --git a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
index a4e79ea..7830bb9 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -81,7 +81,7 @@
mEntityHeaderController
.setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))
- .setLabel(mPairedDevice.getDeviceName())
+ .setLabel(mPairedDevice.name)
.done(mFragment.getActivity(), true);
}
}
diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java
index a82a949..5d30428 100644
--- a/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -77,8 +77,8 @@
static void setTitle(AdbPairedDevicePreference preference,
PairDevice pairedDevice) {
- preference.setTitle(pairedDevice.getDeviceName());
- preference.setSummary(pairedDevice.isConnected()
+ preference.setTitle(pairedDevice.name);
+ preference.setSummary(pairedDevice.connected
? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
: "");
}
diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java
index 68d25e1..82a1fa9 100644
--- a/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -23,6 +23,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.debug.AdbManager;
+import android.debug.FingerprintAndPairDevice;
import android.debug.IAdbManager;
import android.debug.PairDevice;
import android.os.Build;
@@ -310,8 +311,12 @@
mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(
Context.ADB_SERVICE));
try {
- Map<String, PairDevice> newList = mAdbManager.getPairedDevices();
- updatePairedDevicePreferences(newList);
+ FingerprintAndPairDevice[] newList = mAdbManager.getPairedDevices();
+ Map<String, PairDevice> newMap = new HashMap<>();
+ for (FingerprintAndPairDevice pair : newList) {
+ newMap.put(pair.keyFingerprint, pair.device);
+ }
+ updatePairedDevicePreferences(newMap);
mConnectionPort = mAdbManager.getAdbWirelessPort();
if (mConnectionPort > 0) {
Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort);
@@ -430,7 +435,7 @@
case FORGET_ACTION:
try {
p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);
- mAdbManager.unpairDevice(p.getGuid());
+ mAdbManager.unpairDevice(p.guid);
} catch (RemoteException e) {
Log.e(TAG, "Unable to forget the device");
}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
index 25d1cda..e5bd449 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -54,8 +54,8 @@
private boolean mIsExpanded;
public ConditionContextualCardController(Context context) {
- mContext = context;
- mConditionManager = new ConditionManager(context.getApplicationContext(), this);
+ mContext = context.getApplicationContext();
+ mConditionManager = new ConditionManager(mContext, this);
mConditionManager.startMonitoringStateChange();
}
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
index cac6e3f..636800f 100644
--- a/src/com/android/settings/password/OWNERS
+++ b/src/com/android/settings/password/OWNERS
@@ -1,5 +1,9 @@
# Default reviewers for this and subdirectories.
+curtislb@google.com
+ilyamaty@google.com
jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
kchyn@google.com
paulcrowley@google.com
rubinxu@google.com
diff --git a/tests/unit/src/com/android/settings/biometrics/OWNERS b/tests/unit/src/com/android/settings/biometrics/OWNERS
new file mode 100644
index 0000000..a257ed8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/biometrics/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/biometrics/OWNERS