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

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

Merge cherrypicks of [14554374, 14554375, 14554376, 14554377, 14554421,... 

Merge cherrypicks of [14554374, 14554375, 14554376, 14554377, 14554421, 14554378, 14554522, 14554523, 14554381, 14554563, 14554564, 14554566, 14554568, 14554570, 14554571, 14554573, 14554526, 14554576] into security-aosp-oc-mr1-release

Change-Id: Ib303b21e9d73706a280ac42baa46dcebbfb03941
parents 5d095b28 7be44004

src/com/android/settings/DeviceAdminAdd.java

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

    AppOpsManager mAppOps;

    DeviceAdminInfo mDeviceAdmin;

    CharSequence mAddMsgText;

    String mAddMsgText;

    String mProfileOwnerName;



    ImageView mAdminIcon;
@@ -278,7 +278,11 @@ public class DeviceAdminAdd extends Activity { 
            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);
@@ -558,7 +562,7 @@ public class DeviceAdminAdd extends Activity { 
        if (mAddingProfileOwner) {

            mProfileOwnerWarning.setVisibility(View.VISIBLE);

        }

        if (mAddMsgText != null) {

         if (!TextUtils.isEmpty(mAddMsgText)) {

            mAddMsg.setText(mAddMsgText);

            mAddMsg.setVisibility(View.VISIBLE);

        } else {

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

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


package com.android.settings.bluetooth;



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



import android.app.Activity;

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

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        setContentView(R.layout.bluetooth_device_picker);

    }

}