am 235d601d: am 424681e4: Settings UI for SIM access profile (2/2) (8faba3dc) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/values/strings.xml

+7 −1

Original line number	Diff line number	Diff line
		@@ -113,6 +113,8 @@
		<string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
		<!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
		<string name="bluetooth_profile_map">Message Access</string>
		<!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
		<string name="bluetooth_profile_sap">SIM Access</string>

		<!-- Bluetooth settings. Connection options screen. The summary for the A2DP checkbox preference when A2DP is connected. -->
		<string name="bluetooth_a2dp_profile_summary_connected">Connected to media audio</string>
		@@ -122,6 +124,8 @@
		<string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the map checkbox preference when map is connected. -->
		<string name="bluetooth_map_profile_summary_connected">Connected to map</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the sap checkbox preference when SAP is connected. -->
		<string name="bluetooth_sap_profile_summary_connected">Connected to SAP</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the OPP checkbox preference when OPP is not connected. -->
		<string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
		@@ -137,6 +141,8 @@
		<string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
		<string name="bluetooth_map_profile_summary_use_for">Use for map</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
		<string name="bluetooth_sap_profile_summary_use_for">Use for SIM access</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
		<string name="bluetooth_a2dp_profile_summary_use_for">Use for media audio</string>
		<!-- Bluetooth settings. Connection options screen. The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+21 −4

Original line number	Diff line number	Diff line
		@@ -67,10 +67,6 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe

		private boolean mVisible;

		private int mPhonebookPermissionChoice;

		private int mMessagePermissionChoice;

		private int mMessageRejectionCount;

		private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
		@@ -556,6 +552,7 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
		mConnectAfterPairing = false; // cancel auto-connect
		setPhonebookPermissionChoice(ACCESS_UNKNOWN);
		setMessagePermissionChoice(ACCESS_UNKNOWN);
		setSimPermissionChoice(ACCESS_UNKNOWN);
		mMessageRejectionCount = 0;
		saveMessageRejectionCount();
		}
		@@ -732,6 +729,26 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
		mDevice.setMessageAccessPermission(permission);
		}

		public int getSimPermissionChoice() {
		int permission = mDevice.getSimAccessPermission();
		if (permission == BluetoothDevice.ACCESS_ALLOWED) {
		return ACCESS_ALLOWED;
		} else if (permission == BluetoothDevice.ACCESS_REJECTED) {
		return ACCESS_REJECTED;
		}
		return ACCESS_UNKNOWN;
		}

		void setSimPermissionChoice(int permissionChoice) {
		int permission = BluetoothDevice.ACCESS_UNKNOWN;
		if (permissionChoice == ACCESS_ALLOWED) {
		permission = BluetoothDevice.ACCESS_ALLOWED;
		} else if (permissionChoice == ACCESS_REJECTED) {
		permission = BluetoothDevice.ACCESS_REJECTED;
		}
		mDevice.setSimAccessPermission(permission);
		}

		// Migrates data from old data store (in Settings app's shared preferences) to new (in Bluetooth
		// app's shared preferences).
		private void migrateMessagePermissionChoice() {

packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java

0 → 100644

+216 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/

		package com.android.settingslib.bluetooth;

		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothClass;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothSap;
		import android.bluetooth.BluetoothProfile;
		import android.bluetooth.BluetoothUuid;
		import android.content.Context;
		import android.os.ParcelUuid;
		import android.util.Log;

		import com.android.settingslib.R;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* SapProfile handles Bluetooth SAP profile.
		*/
		final class SapProfile implements LocalBluetoothProfile {
		private static final String TAG = "SapProfile";
		private static boolean V = true;

		private BluetoothSap mService;
		private boolean mIsProfileReady;

		private final LocalBluetoothAdapter mLocalAdapter;
		private final CachedBluetoothDeviceManager mDeviceManager;
		private final LocalBluetoothProfileManager mProfileManager;

		static final ParcelUuid[] UUIDS = {
		BluetoothUuid.SAP,
		};

		static final String NAME = "SAP";

		// Order of this profile in device profiles list
		private static final int ORDINAL = 10;

		// These callbacks run on the main thread.
		private final class SapServiceListener
		implements BluetoothProfile.ServiceListener {

		public void onServiceConnected(int profile, BluetoothProfile proxy) {
		if (V) Log.d(TAG,"Bluetooth service connected");
		mService = (BluetoothSap) proxy;
		// We just bound to the service, so refresh the UI for any connected SAP devices.
		List<BluetoothDevice> deviceList = mService.getConnectedDevices();
		while (!deviceList.isEmpty()) {
		BluetoothDevice nextDevice = deviceList.remove(0);
		CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
		// we may add a new device here, but generally this should not happen
		if (device == null) {
		Log.w(TAG, "SapProfile found new device: " + nextDevice);
		device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
		}
		device.onProfileStateChanged(SapProfile.this,
		BluetoothProfile.STATE_CONNECTED);
		device.refresh();
		}

		mProfileManager.callServiceConnectedListeners();
		mIsProfileReady=true;
		}

		public void onServiceDisconnected(int profile) {
		if (V) Log.d(TAG,"Bluetooth service disconnected");
		mProfileManager.callServiceDisconnectedListeners();
		mIsProfileReady=false;
		}
		}

		public boolean isProfileReady() {
		return mIsProfileReady;
		}

		SapProfile(Context context, LocalBluetoothAdapter adapter,
		CachedBluetoothDeviceManager deviceManager,
		LocalBluetoothProfileManager profileManager) {
		mLocalAdapter = adapter;
		mDeviceManager = deviceManager;
		mProfileManager = profileManager;
		mLocalAdapter.getProfileProxy(context, new SapServiceListener(),
		BluetoothProfile.SAP);
		}

		public boolean isConnectable() {
		return true;
		}

		public boolean isAutoConnectable() {
		return true;
		}

		public boolean connect(BluetoothDevice device) {
		if (mService == null) return false;
		List<BluetoothDevice> sinks = mService.getConnectedDevices();
		if (sinks != null) {
		for (BluetoothDevice sink : sinks) {
		mService.disconnect(sink);
		}
		}
		return mService.connect(device);
		}

		public boolean disconnect(BluetoothDevice device) {
		if (mService == null) return false;
		List<BluetoothDevice> deviceList = mService.getConnectedDevices();
		if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
		if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
		mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
		}
		return mService.disconnect(device);
		} else {
		return false;
		}
		}

		public int getConnectionStatus(BluetoothDevice device) {
		if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
		List<BluetoothDevice> deviceList = mService.getConnectedDevices();

		return !deviceList.isEmpty() && deviceList.get(0).equals(device)
		? mService.getConnectionState(device)
		: BluetoothProfile.STATE_DISCONNECTED;
		}

		public boolean isPreferred(BluetoothDevice device) {
		if (mService == null) return false;
		return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
		}

		public int getPreferred(BluetoothDevice device) {
		if (mService == null) return BluetoothProfile.PRIORITY_OFF;
		return mService.getPriority(device);
		}

		public void setPreferred(BluetoothDevice device, boolean preferred) {
		if (mService == null) return;
		if (preferred) {
		if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
		mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
		}
		} else {
		mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
		}
		}

		public List<BluetoothDevice> getConnectedDevices() {
		if (mService == null) return new ArrayList<BluetoothDevice>(0);
		return mService.getDevicesMatchingConnectionStates(
		new int[] {BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTING});
		}

		public String toString() {
		return NAME;
		}

		public int getOrdinal() {
		return ORDINAL;
		}

		public int getNameResource(BluetoothDevice device) {
		return R.string.bluetooth_profile_sap;
		}

		public int getSummaryResourceForDevice(BluetoothDevice device) {
		int state = getConnectionStatus(device);
		switch (state) {
		case BluetoothProfile.STATE_DISCONNECTED:
		return R.string.bluetooth_sap_profile_summary_use_for;

		case BluetoothProfile.STATE_CONNECTED:
		return R.string.bluetooth_sap_profile_summary_connected;

		default:
		return Utils.getConnectionStateSummary(state);
		}
		}

		public int getDrawableResource(BluetoothClass btClass) {
		return R.drawable.ic_bt_cellphone;
		}

		protected void finalize() {
		if (V) Log.d(TAG, "finalize()");
		if (mService != null) {
		try {
		BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.SAP,
		mService);
		mService = null;
		}catch (Throwable t) {
		Log.w(TAG, "Error cleaning up SAP proxy", t);
		}
		}
		}
		}