Merge "Delete BluetoothOppFileProvider" am: 37e8508618 (a64b304c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/AndroidManifest.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -362,14 +362,6 @@
		<path-permission android:pathPrefix="/btopp"
		android:permission="android.permission.ACCESS_BLUETOOTH_SHARE"/>
		</provider>
		<provider android:name="com.android.bluetooth.opp.BluetoothOppFileProvider"
		android:authorities="com.android.bluetooth.opp.fileprovider"
		android:grantUriPermissions="true"
		android:enabled="false"
		android:exported="false">
		<meta-data android:name="android.support.FILE_PROVIDER_PATHS"
		android:resource="@xml/file_paths"/>
		</provider>
		<receiver android:process="@string/process"
		android:name="com.android.bluetooth.opp.BluetoothOppReceiver"
		android:exported="true"

android/app/src/com/android/bluetooth/opp/BluetoothOppFileProvider.java

deleted100644 → 0

+0 −119

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.bluetooth.opp;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.ProviderInfo;
		import android.net.Uri;
		import android.os.UserManager;
		import android.util.Log;

		import androidx.core.content.FileProvider;

		import java.io.File;

		/**
		* A FileProvider for files received by Bluetooth share
		*/
		public class BluetoothOppFileProvider extends FileProvider {
		private static final String TAG = "BluetoothOppFileProvider";

		private Context mContext = null;
		private ProviderInfo mProviderInfo = null;
		private boolean mRegisteredReceiver = false;
		private boolean mInitialized = false;

		/** Broadcast receiver that attach FileProvider info when user unlocks the phone for the
		* first time after reboot and the credential-encrypted storage is available.
		*/
		private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(final Context context, Intent intent) {
		if (Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) {
		attachInfo(mContext, mProviderInfo);
		}
		}
		};

		/**
		* After the FileProvider is instantiated, this method is called to provide the system with
		* information about the provider. The actual initialization is delayed until user unlock the
		* device
		*
		* @param context A {@link Context} for the current component.
		* @param info A {@link ProviderInfo} for the new provider.
		*/
		@Override
		public void attachInfo(Context context, ProviderInfo info) {
		synchronized (this) {
		mContext = context;
		mProviderInfo = info;
		if (!mRegisteredReceiver) {
		IntentFilter userFilter = new IntentFilter();
		userFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
		userFilter.addAction(Intent.ACTION_USER_UNLOCKED);
		mContext.registerReceiver(mBroadcastReceiver, userFilter, null, null);
		mRegisteredReceiver = true;
		}
		UserManager userManager = context.getSystemService(UserManager.class);
		if (userManager.isUserUnlocked()) {
		if (!mInitialized) {
		if (Constants.DEBUG) {
		Log.d(TAG, "Initialized");
		}
		super.attachInfo(mContext, mProviderInfo);
		mInitialized = true;
		}
		if (mRegisteredReceiver) {
		mContext.unregisterReceiver(mBroadcastReceiver);
		mRegisteredReceiver = false;
		}
		}
		}
		}

		/**
		* Return a content URI for a given {@link File}. Specific temporary
		* permissions for the content URI can be set with
		* {@link Context#grantUriPermission(String, Uri, int)}, or added
		* to an {@link Intent} by calling {@link Intent#setData(Uri) setData()} and then
		* {@link Intent#setFlags(int) setFlags()}; in both cases, the applicable flags are
		* {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} and
		* {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}. A FileProvider can only return a
		* <code>content</code> {@link Uri} for file paths defined in their <code><paths></code>
		* meta-data element. See the Class Overview for more information.
		*
		* @param context A {@link Context} for the current component.
		* @param authority The authority of a {@link FileProvider} defined in a
		* {@code <provider>} element in your app's manifest.
		* @param file A {@link File} pointing to the filename for which you want a
		* <code>content</code> {@link Uri}.
		* @return A content URI for the file. Null if the user hasn't unlock the phone
		* @throws IllegalArgumentException When the given {@link File} is outside
		* the paths supported by the provider.
		*/
		public static Uri getUriForFile(Context context, String authority, File file) {
		UserManager userManager = context.getSystemService(UserManager.class);
		if (!userManager.isUserUnlocked()) {
		return null;
		}
		context = context.createCredentialProtectedStorageContext();
		return FileProvider.getUriForFile(context, authority, file);
		}
		}

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -84,8 +84,6 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
		*/
		private static final String OPP_PROVIDER =
		BluetoothOppProvider.class.getCanonicalName();
		private static final String OPP_FILE_PROVIDER =
		BluetoothOppFileProvider.class.getCanonicalName();
		private static final String INCOMING_FILE_CONFIRM_ACTIVITY =
		BluetoothOppIncomingFileConfirmActivity.class.getCanonicalName();
		private static final String TRANSFER_ACTIVITY =
		@@ -244,7 +242,6 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
		}

		setComponentAvailable(OPP_PROVIDER, true);
		setComponentAvailable(OPP_FILE_PROVIDER, true);
		setComponentAvailable(INCOMING_FILE_CONFIRM_ACTIVITY, true);
		setComponentAvailable(TRANSFER_ACTIVITY, true);
		setComponentAvailable(TRANSFER_HISTORY_ACTIVITY, true);
		@@ -285,7 +282,6 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
		mHandler.sendMessage(mHandler.obtainMessage(STOP_LISTENER));

		setComponentAvailable(OPP_PROVIDER, false);
		setComponentAvailable(OPP_FILE_PROVIDER, false);
		setComponentAvailable(INCOMING_FILE_CONFIRM_ACTIVITY, false);
		setComponentAvailable(TRANSFER_ACTIVITY, false);
		setComponentAvailable(TRANSFER_HISTORY_ACTIVITY, false);