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

Commit 4d587c5a authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: 30e9d28c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043
parents 8750762c 30e9d28c

packages/CompanionDeviceManager/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>





    <application

    <application

        android:allowClearUserData="true"

        android:allowClearUserData="true"

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.companiondevicemanager;

package com.android.companiondevicemanager;





import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;

import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;





import android.app.Activity;

import android.app.Activity;

import android.companion.CompanionDeviceManager;

import android.companion.CompanionDeviceManager;
@@ -56,6 +57,8 @@ public class DeviceChooserActivity extends Activity { 
            Log.e(LOG_TAG, "About to show UI, but no devices to show");

            Log.e(LOG_TAG, "About to show UI, but no devices to show");

        }

        }





        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        if (getService().mRequest.isSingleDevice()) {

        if (getService().mRequest.isSingleDevice()) {

            setContentView(R.layout.device_confirmation);

            setContentView(R.layout.device_confirmation);

            final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);

            final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);