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

Commit e1e4c4eb authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 7e78a923 d2150153

core/java/android/debug/AdbManager.java

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ public class AdbManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_DEBUGGING)

    public static final String WIRELESS_DEBUG_STATE_CHANGED_ACTION =

            "com.android.server.adb.WIRELESS_DEBUG_STATUS";
@@ -46,6 +47,7 @@ public class AdbManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_DEBUGGING)

    public static final String WIRELESS_DEBUG_PAIRED_DEVICES_ACTION =

            "com.android.server.adb.WIRELESS_DEBUG_PAIRED_DEVICES";
@@ -59,6 +61,7 @@ public class AdbManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_DEBUGGING)

    public static final String WIRELESS_DEBUG_PAIRING_RESULT_ACTION =

            "com.android.server.adb.WIRELESS_DEBUG_PAIRING_RESULT";

core/java/com/android/internal/app/HarmfulAppWarningActivity.java

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


package com.android.internal.app;



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



import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;
@@ -27,6 +29,7 @@ import android.os.Bundle; 
import android.util.Log;

import android.view.View;

import android.widget.TextView;



import com.android.internal.R;



/**
@@ -48,6 +51,7 @@ public class HarmfulAppWarningActivity extends AlertActivity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        final Intent intent = getIntent();

        mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);

        mTarget = intent.getParcelableExtra(Intent.EXTRA_INTENT);

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+15 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.adb; 


import static com.android.internal.util.dump.DumpUtils.writeStringIfNotNull;



import android.annotation.NonNull;

import android.annotation.TestApi;

import android.app.ActivityManager;

import android.app.Notification;
@@ -171,6 +172,12 @@ public class AdbDebuggingManager { 
        mAdbConnectionInfo = new AdbConnectionInfo();

    }



    static void sendBroadcastWithDebugPermission(@NonNull Context context, @NonNull Intent intent,

            @NonNull UserHandle userHandle) {

        context.sendBroadcastAsUser(intent, userHandle,

                android.Manifest.permission.MANAGE_DEBUGGING);

    }



    class PairingThread extends Thread implements NsdManager.RegistrationListener {

        private NsdManager mNsdManager;

        private String mPublicKey;
@@ -1279,7 +1286,7 @@ public class AdbDebuggingManager { 
                    ? AdbManager.WIRELESS_STATUS_CONNECTED

                    : AdbManager.WIRELESS_STATUS_DISCONNECTED);

            intent.putExtra(AdbManager.WIRELESS_DEBUG_PORT_EXTRA, port);

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent, UserHandle.ALL);

        }



        private void onAdbdWifiServerConnected(int port) {
@@ -1351,7 +1358,8 @@ public class AdbDebuggingManager { 
            if (publicKey == null) {

                Intent intent = new Intent(AdbManager.WIRELESS_DEBUG_PAIRING_RESULT_ACTION);

                intent.putExtra(AdbManager.WIRELESS_STATUS_EXTRA, AdbManager.WIRELESS_STATUS_FAIL);

                mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

                AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent,

                        UserHandle.ALL);

            } else {

                Intent intent = new Intent(AdbManager.WIRELESS_DEBUG_PAIRING_RESULT_ACTION);

                intent.putExtra(AdbManager.WIRELESS_STATUS_EXTRA,
@@ -1364,7 +1372,8 @@ public class AdbDebuggingManager { 
                }

                PairDevice device = new PairDevice(fingerprints, hostname, false);

                intent.putExtra(AdbManager.WIRELESS_PAIR_DEVICE_EXTRA, device);

                mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

                AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent,

                        UserHandle.ALL);

                // Add the key into the keystore

                mAdbKeyStore.setLastConnectionTime(publicKey,

                        System.currentTimeMillis());
@@ -1378,14 +1387,14 @@ public class AdbDebuggingManager { 
            intent.putExtra(AdbManager.WIRELESS_STATUS_EXTRA,

                    AdbManager.WIRELESS_STATUS_CONNECTED);

            intent.putExtra(AdbManager.WIRELESS_DEBUG_PORT_EXTRA, port);

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent, UserHandle.ALL);

        }



        private void sendPairedDevicesToUI(Map<String, PairDevice> devices) {

            Intent intent = new Intent(AdbManager.WIRELESS_DEBUG_PAIRED_DEVICES_ACTION);

            // Map is not serializable, so need to downcast

            intent.putExtra(AdbManager.WIRELESS_DEVICES_EXTRA, (HashMap) devices);

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent, UserHandle.ALL);

        }



        private void updateUIPairCode(String code) {
@@ -1395,7 +1404,7 @@ public class AdbDebuggingManager { 
            intent.putExtra(AdbManager.WIRELESS_PAIRING_CODE_EXTRA, code);

            intent.putExtra(AdbManager.WIRELESS_STATUS_EXTRA,

                    AdbManager.WIRELESS_STATUS_PAIRING_CODE);

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent, UserHandle.ALL);

        }

    }

services/core/java/com/android/server/adb/AdbService.java

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class AdbService extends IAdbManager.Stub { 
                ? AdbManager.WIRELESS_STATUS_CONNECTED

                : AdbManager.WIRELESS_STATUS_DISCONNECTED);

        intent.putExtra(AdbManager.WIRELESS_DEBUG_PORT_EXTRA, port);

        mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

        AdbDebuggingManager.sendBroadcastWithDebugPermission(mContext, intent, UserHandle.ALL);

        Slog.i(TAG, "sent port broadcast port=" + port);

    }

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,6 @@ public final class ActiveServices { 
                        final long delayMs = SystemClock.elapsedRealtime() -

                                r.mLastSetFgsRestrictionTime;

                        if (delayMs > mAm.mConstants.mFgsStartForegroundTimeoutMs) {

                            resetFgsRestrictionLocked(r);

                            setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.pid,

                                    r.appInfo.uid, r, false);

                            EventLog.writeEvent(0x534e4554, "183147114", r.appInfo.uid,
@@ -5046,5 +5045,6 @@ public final class ActiveServices { 


    private void resetFgsRestrictionLocked(ServiceRecord r) {

        r.mAllowWhileInUsePermissionInFgs = false;

        r.mLastSetFgsRestrictionTime = 0;

    }

}