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

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

Merge "resolved conflicts for merge of a3d5d3b8 to master"

parents fca5f523 067351f8

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;
@@ -45,7 +47,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
@@ -1445,6 +1445,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
@@ -1647,6 +1647,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="string" name="config_defaultNetworkScorerPackageName" />



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