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

Commit 90e96db0 authored by Vinod Krishnan's avatar Vinod Krishnan Committed by Android (Google) Code Review
Browse files

Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev

parents 42db3761 b0e5bbb6

core/java/com/android/internal/net/VpnConfig.java

+6 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.internal.net;



import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.UserHandle;
@@ -47,7 +49,10 @@ public class VpnConfig implements Parcelable { 


    public static Intent getIntentForConfirmation() {

        Intent intent = new Intent();

        intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ConfirmDialog");

        ComponentName componentName = ComponentName.unflattenFromString(

                Resources.getSystem().getString(

                        com.android.internal.R.string.config_customVpnConfirmDialogComponent));

        intent.setClassName(componentName.getPackageName(), componentName.getClassName());

        return intent;

    }

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,10 @@ 
    <string name="config_customAdbPublicKeyConfirmationComponent"

            >com.android.systemui/com.android.systemui.usb.UsbDebuggingActivity</string>



    <!-- Name of the CustomDialog that is used for VPN -->

    <string name="config_customVpnConfirmDialogComponent"

            >com.android.vpndialogs/com.android.vpndialogs.CustomDialog</string>



    <!-- Apps that are authorized to access shared accounts, overridden by product overlays -->

    <string name="config_appsAuthorizedForSharedAccounts">;com.android.settings;</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,7 @@ 
  <java-symbol type="integer" name="config_maximumScreenDimDuration" />

  <java-symbol type="fraction" name="config_maximumScreenDimRatio" />

  <java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" />

  <java-symbol type="string" name="config_customVpnConfirmDialogComponent" />



  <java-symbol type="layout" name="resolver_list" />

  <java-symbol type="id" name="resolver_list" />