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

Commit b46f5219 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Fix enterprise resources ID typos" into tm-dev

parents 9f268ea1 657becf1

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar; 


import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;

import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE;

import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE;

import static android.view.View.GONE;

import static android.view.View.VISIBLE;
@@ -392,7 +393,7 @@ public class KeyguardIndicationController { 
                    organizationName);

        } else {

            return mDevicePolicyManager.getResources().getString(

                    KEYGUARD_MANAGEMENT_DISCLOSURE,

                    KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE,

                    () -> packageResources.getString(

                            R.string.do_disclosure_with_name, organizationName),

                    organizationName);

services/core/java/com/android/server/pm/PackageInstallerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        private String getDeviceOwnerDeletedPackageMsg() {

            DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);

            return dpm.getResources().getString(PACKAGE_DELETED_BY_DO,

                    () -> mContext.getString(R.string.package_updated_device_owner));

                    () -> mContext.getString(R.string.package_deleted_device_owner));

        }



        @Override