Snap for 6022569 from ca54abffc7d1962abc991bd3cfdf7e9dd0d9c3f1 to rvc-release (d4e146dc) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		services.net \
		libprotobuf-java-lite \
		bluetooth-protos-lite \
		guava \

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		androidx.core_core \

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1255,7 +1255,9 @@ static jint createSocketChannelNative(JNIEnv* env, jobject obj, jint type,
		goto done;
		}
		uuidBytes = env->GetByteArrayElements(uuid, nullptr);
		if (serviceName != nullptr) {
		nativeServiceName = env->GetStringUTFChars(serviceName, nullptr);
		}
		if (uuidBytes == nullptr) {
		jniThrowIOException(env, EINVAL);
		goto done;

android/app/src/com/android/bluetooth/AlertActivity.java

0 → 100644

+115 −0

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

		import android.app.Activity;
		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.view.ViewGroup;
		import android.view.Window;
		import android.view.accessibility.AccessibilityEvent;

		/**
		* An activity that follows the visual style of an AlertDialog.
		*
		* @see #mAlert
		* @see #setupAlert()
		*/
		public abstract class AlertActivity extends Activity implements DialogInterface.OnDismissListener,
		DialogInterface.OnCancelListener {

		/**
		* The model for the alert.
		*
		*/
		protected AlertDialog.Builder mAlertBuilder;
		private AlertDialog mAlert;

		public AlertActivity() {}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		requestWindowFeature(Window.FEATURE_NO_TITLE);
		mAlertBuilder = new AlertDialog.Builder(this);
		mAlertBuilder.setOnDismissListener(this);
		mAlertBuilder.setOnCancelListener(this);
		}

		@Override
		public void onDismiss(DialogInterface dialog) {
		if (!isFinishing()) {
		finish();
		}
		}

		@Override
		public void onCancel(DialogInterface dialog) {
		if (!isFinishing()) {
		finish();
		}
		}

		@Override
		public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
		return dispatchPopulateAccessibilityEvent(this, event);
		}

		private static boolean dispatchPopulateAccessibilityEvent(Activity act,
		AccessibilityEvent event) {
		event.setClassName(Dialog.class.getName());
		event.setPackageName(act.getPackageName());

		ViewGroup.LayoutParams params = act.getWindow().getAttributes();
		boolean isFullScreen = (params.width == ViewGroup.LayoutParams.MATCH_PARENT)
		&& (params.height == ViewGroup.LayoutParams.MATCH_PARENT);
		event.setFullScreen(isFullScreen);

		return false;
		}

		protected void setupAlert() {
		mAlert = mAlertBuilder.create();
		mAlert.show();
		}

		protected void changeIconAttribute(int attrId) {
		if (mAlert == null) return;
		mAlert.setIconAttribute(attrId);
		}
		protected void changeTitle(CharSequence title) {
		if (mAlert == null) return;
		mAlert.setTitle(title);
		}

		protected void changeButtonVisibility(int identifier, int visibility) {
		if (mAlert == null) return;
		mAlert.getButton(identifier).setVisibility(visibility);
		}

		protected void changeButtonText(int identifier, CharSequence text) {
		if (mAlert == null) return;
		mAlert.getButton(identifier).setText(text);
		}

		protected void changeButtonEnabled(int identifier, boolean enable) {
		if (mAlert == null) return;
		mAlert.getButton(identifier).setEnabled(enable);
		}
		}

android/app/src/com/android/bluetooth/Utils.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.bluetooth;

		import android.app.ActivityManager;
		import android.app.AppOpsManager;
		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothDevice;
		@@ -41,7 +40,9 @@ import java.nio.ByteBuffer;
		import java.nio.ByteOrder;
		import java.nio.charset.Charset;
		import java.nio.charset.CharsetDecoder;
		import java.util.List;
		import java.time.Instant;
		import java.time.ZoneId;
		import java.time.format.DateTimeFormatter;
		import java.util.UUID;
		import java.util.concurrent.TimeUnit;

		@@ -468,4 +469,14 @@ public final class Utils {
		public static String getUidPidString() {
		return "uid/pid=" + Binder.getCallingUid() + "/" + Binder.getCallingPid();
		}

		/**
		* Get system local time
		*
		* @return "MM-dd HH:mm:ss.SSS"
		*/
		public static String getLocalTimeString() {
		return DateTimeFormatter.ofPattern("MM-dd HH:mm:ss.SSS")
		.withZone(ZoneId.systemDefault()).format(Instant.now());
		}
		}

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+477 −0

File changed.

Preview size limit exceeded, changes collapsed.