Merge "Merge 7e67d6fba7887abd51d0123975dcc688fb1eb136 on remote branch" (2f0cab58) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,9 @@ public class AppOpsManager {
		/** @hide */
		public static final int OP_WRITE_MMS = 48;
		/** @hide */
		public static final int _NUM_OP = 49;
		public static final int OP_BOOT_COMPLETED = 49;
		/** @hide */
		public static final int _NUM_OP = 50;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION =
		@@ -280,6 +282,7 @@ public class AppOpsManager {
		OP_SEND_MMS,
		OP_READ_MMS,
		OP_WRITE_MMS,
		OP_BOOT_COMPLETED,
		};

		/**
		@@ -336,6 +339,7 @@ public class AppOpsManager {
		null,
		null,
		null,
		null,
		};

		/**
		@@ -392,6 +396,7 @@ public class AppOpsManager {
		"SEND_MMS",
		"READ_MMS",
		"WRITE_MMS",
		"BOOT_COMPLETED",
		};

		/**
		@@ -448,6 +453,7 @@ public class AppOpsManager {
		android.Manifest.permission.SEND_SMS,
		android.Manifest.permission.READ_SMS,
		android.Manifest.permission.WRITE_SMS,
		android.Manifest.permission.RECEIVE_BOOT_COMPLETED,
		};

		/**
		@@ -503,6 +509,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // OP_SEND_MMS
		AppOpsManager.MODE_ALLOWED, // OP_READ_MMS
		AppOpsManager.MODE_ALLOWED, // OP_WRITE_MMS
		AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED
		};

		/**
		@@ -558,6 +565,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ASK, // OP_SEND_MMS
		AppOpsManager.MODE_ASK, // OP_READ_MMS
		AppOpsManager.MODE_ASK, // OP_WRITE_MMS
		AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED
		};


		@@ -618,6 +626,7 @@ public class AppOpsManager {
		false,
		false,
		false,
		false,
		};

		private static HashMap<String, Integer> sOpStrToOp = new HashMap<String, Integer>();

core/java/android/bluetooth/BluetoothSap.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ public final class BluetoothSap implements BluetoothProfile {
		synchronized (mConnection) {
		if ( mSapService != null) {
		try {
		mSapService.cleanup();
		mSapService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {
		@@ -150,6 +151,7 @@ public final class BluetoothSap implements BluetoothProfile {
		synchronized (mConnection) {
		if ( mSapService != null) {
		try {
		mSapService.cleanup();
		mSapService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -402,13 +402,21 @@ public class BluetoothTetheringDataTracker extends BaseNetworkStateTracker {
		} else {
		ac.sendMessage(
		AsyncChannel.CMD_CHANNEL_FULL_CONNECTION);
		mStackChannel = ac;
		if (VDBG) Log.d(TAG, "CMD_CHANNEL_HALF_CONNECTED: " + mStackChannel);
		}
		}
		break;
		case AsyncChannel.CMD_CHANNEL_DISCONNECTED:
		if (VDBG) Log.d(TAG, "got CMD_CHANNEL_DISCONNECTED");
		if (mStackChannel != null) {
		mBtdt.stopReverseTether();
		mBtdt.mAsyncChannel.set(null);

		Log.d(TAG, "Disconnect CMD_CHANNEL_HALF_CONNECTED: " + mStackChannel);
		mStackChannel.disconnect();
		mStackChannel = null;
		}
		break;
		case NetworkStateTracker.EVENT_NETWORK_CONNECTED:
		LinkProperties linkProperties = (LinkProperties)(msg.obj);

core/java/android/bluetooth/IBluetoothSap.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.bluetooth.BluetoothDevice;
		*/
		interface IBluetoothSap {
		// Public API
		boolean cleanup();
		boolean disconnect(in BluetoothDevice device);
		int getConnectionState(in BluetoothDevice device);
		List<BluetoothDevice> getConnectedDevices();

core/res/res/layout/permission_confirmation_dialog.xml

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright (c) 2013, The Linux Foundation. All rights reserved.
		** Not a Contribution.
		**
		** Copyright 2012 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.
		*/
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/parentPanel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="8dip"
		android:layout_marginRight="8dip"
		android:orientation="vertical">

		<TextView android:id="@+id/permission_text"
		style="?android:attr/textAppearanceMedium"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingLeft="20dip"
		android:paddingRight="20dip"
		android:paddingTop="16dip"
		android:paddingBottom="16dip" />

		<TableLayout android:id="@+id/permission_remember_layout"
		android:shrinkColumns="1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="16dip"
		android:paddingRight="16dip">

		<TableRow
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" >
		<RelativeLayout android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="12dip"
		android:paddingLeft="8dip" >
		<CheckBox android:id="@+id/permission_remember_choice_checkbox"
		android:paddingTop="11dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		</RelativeLayout>
		<TextView android:id="@+id/permission_remember_choice_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="18dip"
		android:text="@string/permission_remember_choice" />
		</TableRow>

		</TableLayout>

		</LinearLayout>