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

Unverified Commit c8b6a387 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-9.0.0_r70' into staging/lineage-16.0_merge_android-security-9.0.0_r70 

Android security 9.0.0 release 70

* tag 'android-security-9.0.0_r70':
  Prevent drawing on top of DevicePickerActivity
  Prevent HTML Injection on the Device Admin request screen

Change-Id: Ifd31996eb33e92e369f55cb02912e4a584c36400
parents 51d0dcd1 9e561c23

src/com/android/settings/DeviceAdminAdd.java

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

    AppOpsManager mAppOps;

    DeviceAdminInfo mDeviceAdmin;

    CharSequence mAddMsgText;

    String mAddMsgText;

    String mProfileOwnerName;



    ImageView mAdminIcon;
@@ -276,7 +276,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);
@@ -568,7 +572,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);

    }

}