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

Commit ca3997d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I54360698,Ic8a3db21 

* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert
parents 19449197 b076e00c

res/values/strings.xml

+2 −6
Original line number Diff line number Diff line
@@ -8246,10 +8246,8 @@ 
    <string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string>

    <!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>

    <!-- Label explaining that the admin installed trusted CA certificates for the current user. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_ca_certs_user">Trusted credentials</string>

    <!-- Label explaining that the admin installed trusted CA certificates for the personal profile. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_ca_certs_personal">Trusted credentials in your personal profile</string>

    <!-- Label explaining that the admin installed trusted CA certificates. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_ca_certs">Trusted credentials</string>

    <!-- Summary indicating the number of trusted CA certificates installed by the admin. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_ca_certs">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate</item>
@@ -8260,8 +8258,6 @@ 
        <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate. Tap to view.</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> CA certificates. Tap to view.</item>

    </plurals>

    <!-- Label explaining that the admin installed trusted CA certificates for the work profile. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_ca_certs_work">Trusted credentials in your work profile</string>

    <!-- Label explaining that the admin can lock the device and change the user's password. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_lock_device">Admin can lock the device and reset password</string>

    <!-- Label explaining that the admin can wipe the device remotely. [CHAR LIMIT=NONE] -->

res/xml/enterprise_privacy_settings.xml

+2 −5
Original line number Diff line number Diff line
@@ -90,11 +90,8 @@ 
                android:title="@string/enterprise_privacy_global_http_proxy"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="ca_certs_current_user"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="ca_certs_managed_profile"

                android:title="@string/enterprise_privacy_ca_certs_work"

                android:key="ca_certs"

                android:title="@string/enterprise_privacy_ca_certs"

                settings:multiLine="true"/>

    </PreferenceCategory>

src/com/android/settings/applications/ApplicationFeatureProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -54,9 +54,10 @@ public interface ApplicationFeatureProvider { 
     *

     * @param permissions Only consider apps that have been granted one or more of these permissions

     *        by the admin, either at run-time or install-time

     * @param async Whether to count asynchronously in a background thread

     * @param callback The callback to invoke with the result

     */

    void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions,

    void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions, boolean async,

            NumberOfAppsCallback callback);



    /**

src/com/android/settings/applications/ApplicationFeatureProviderImpl.java

+9 −3
Original line number Diff line number Diff line
@@ -69,9 +69,15 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide 


    @Override

    public void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions,

            NumberOfAppsCallback callback) {

        new AllUserAppWithAdminGrantedPermissionsCounter(mContext, permissions, mPm, mPms, mDpm,

                callback).execute();

            boolean async, NumberOfAppsCallback callback) {

        final AllUserAppWithAdminGrantedPermissionsCounter counter =

                new AllUserAppWithAdminGrantedPermissionsCounter(mContext, permissions, mPm, mPms,

                        mDpm, callback);

        if (async) {

            counter.execute();

        } else {

            counter.executeInForeground();

        }

    }



    @Override

src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -17,14 +17,18 @@ package com.android.settings.enterprise; 
import android.Manifest;

import android.content.Context;



import com.android.settings.core.lifecycle.Lifecycle;



public class AdminGrantedCameraPermissionPreferenceController extends

        AdminGrantedPermissionsPreferenceControllerBase {



    private static final String KEY_ENTERPRISE_PRIVACY_NUMBER_CAMERA_ACCESS_PACKAGES

            = "enterprise_privacy_number_camera_access_packages";



    public AdminGrantedCameraPermissionPreferenceController(Context context) {

        super(context, new String[] {Manifest.permission.CAMERA}, Manifest.permission_group.CAMERA);

    public AdminGrantedCameraPermissionPreferenceController(Context context, Lifecycle lifecycle,

            boolean async) {

        super(context, lifecycle, async, new String[] {Manifest.permission.CAMERA},

                Manifest.permission_group.CAMERA);

    }



    @Override