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

Commit 9e561c23 authored by android-build-team Robot's avatar android-build-team Robot Committed by Anis Assi
Browse files

Merge cherrypicks of [14553530, 14552439, 14553531, 14553532, 14554542,... 

Merge cherrypicks of [14553530, 14552439, 14553531, 14553532, 14554542, 14551981, 14553644, 14553645, 14554582, 14554583, 14554584, 14553501, 14554602, 14554603, 14554604, 14552580, 14553646, 14553647] into security-aosp-pi-release

Change-Id: Iefedeef79095f09542a6936b2cb9cc45ca0c3361
parents 320ff004 1f1d308e

src/com/android/settings/DeviceAdminAdd.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ public class DeviceAdminAdd extends Activity { 
    DevicePolicyManager mDPM;

    DevicePolicyManager mDPM;

    AppOpsManager mAppOps;

    AppOpsManager mAppOps;

    DeviceAdminInfo mDeviceAdmin;

    DeviceAdminInfo mDeviceAdmin;

    CharSequence mAddMsgText;

    String mAddMsgText;

    String mProfileOwnerName;

    String mProfileOwnerName;





    ImageView mAdminIcon;

    ImageView mAdminIcon;
@@ -276,7 +276,11 @@ public class DeviceAdminAdd extends Activity { 
            return;

            return;

        }

        }





        mAddMsgText = getIntent().getCharSequenceExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION);

        final CharSequence addMsgCharSequence = getIntent().getCharSequenceExtra(

                DevicePolicyManager.EXTRA_ADD_EXPLANATION);

        if (addMsgCharSequence != null) {

            mAddMsgText = addMsgCharSequence.toString();

        }





        setContentView(R.layout.device_admin_add);

        setContentView(R.layout.device_admin_add);
@@ -568,7 +572,7 @@ public class DeviceAdminAdd extends Activity { 
        if (mAddingProfileOwner) {

        if (mAddingProfileOwner) {

            mProfileOwnerWarning.setVisibility(View.VISIBLE);

            mProfileOwnerWarning.setVisibility(View.VISIBLE);

        }

        }

        if (mAddMsgText != null) {

         if (!TextUtils.isEmpty(mAddMsgText)) {

            mAddMsg.setText(mAddMsgText);

            mAddMsg.setText(mAddMsgText);

            mAddMsg.setVisibility(View.VISIBLE);

            mAddMsg.setVisibility(View.VISIBLE);

        } else {

        } else {

src/com/android/settings/bluetooth/DevicePickerActivity.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.settings.bluetooth;

package com.android.settings.bluetooth;





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



import android.app.Activity;

import android.app.Activity;

import android.os.Bundle;

import android.os.Bundle;
@@ -30,6 +32,7 @@ public final class DevicePickerActivity extends Activity { 
    @Override

    @Override

    protected void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        setContentView(R.layout.bluetooth_device_picker);

        setContentView(R.layout.bluetooth_device_picker);

    }

    }

}
 
}