Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9ef252 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11920703 from 4fafc0ce to 24Q3-release 

Change-Id: Iab7ade6214661c4e2c844fd0387fa86780af3f97
parents 0f8a1c89 4fafc0ce

android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapContract.java

+542 −621

File changed.

Preview size limit exceeded, changes collapsed.

android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java

+191 −167

File changed.

Preview size limit exceeded, changes collapsed.

android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapIMProvider.java

+206 −172

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −11
Original line number Diff line number Diff line
@@ -38,14 +38,12 @@ import com.android.internal.annotations.VisibleForTesting; 
 * @see #setupAlert()

 */

@SuppressLint("AndroidFrameworkBluetoothPermission")

public abstract class AlertActivity extends Activity implements DialogInterface.OnDismissListener,

        DialogInterface.OnCancelListener {

public abstract class AlertActivity extends Activity

        implements DialogInterface.OnDismissListener, DialogInterface.OnCancelListener {



    /**

     * The model for the alert.

     *

     */

    /** The model for the alert. */

    protected AlertDialog.Builder mAlertBuilder;



    private AlertDialog mAlert;



    public AlertActivity() {}
@@ -80,13 +78,14 @@ public abstract class AlertActivity extends Activity implements DialogInterface. 
        return dispatchPopulateAccessibilityEvent(this, event);

    }



    private static boolean dispatchPopulateAccessibilityEvent(Activity act,

            AccessibilityEvent 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)

        boolean isFullScreen =

                (params.width == ViewGroup.LayoutParams.MATCH_PARENT)

                        && (params.height == ViewGroup.LayoutParams.MATCH_PARENT);

        event.setFullScreen(isFullScreen);
@@ -102,6 +101,7 @@ public abstract class AlertActivity extends Activity implements DialogInterface. 
        if (mAlert == null) return;

        mAlert.setIconAttribute(attrId);

    }



    protected void changeTitle(CharSequence title) {

        if (mAlert == null) return;

        mAlert.setTitle(title);
@@ -134,5 +134,4 @@ public abstract class AlertActivity extends Activity implements DialogInterface. 
        }

        super.onDestroy();

    }



}

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

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ public class BluetoothEventLogger { 
        }



        public String toString() {

            return (new StringBuilder(mTimeStamp)

                    .append(" ").append(mMsg).toString());

            return (new StringBuilder(mTimeStamp).append(" ").append(mMsg).toString());

        }

    }