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

Commit 192e1c64 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "SettingsLibRestrictedLockUtils" 

* changes:
  Make methods used by PermissionController @SystemApi
  Make restricted lock icon system-api
parents 1db7a487 2f692631

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -219,6 +219,14 @@ package android { 
    field public static final int config_sendPackageName = 17891328; // 0x1110000

  }



  public static final class R.dimen {

    field public static final int config_restricted_icon_size = 17104903; // 0x1050007

  }



  public static final class R.drawable {

    field public static final int ic_info = 17301684; // 0x10800b4

  }



  public static final class R.raw {

    field public static final int loaderror = 17825792; // 0x1100000

    field public static final int nodomain = 17825793; // 0x1100001
@@ -1115,6 +1123,7 @@ package android.content.pm { 
  public class PackageItemInfo {

    method public deprecated java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager);

    method public java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager, float, int);

    method public static void setForceSafeLabels(boolean);

    field public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4

    field public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2

    field public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1
@@ -4195,6 +4204,7 @@ package android.permissionpresenterservice { 
    method public final void attachBaseContext(android.content.Context);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract java.util.List<android.content.pm.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String);

    method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String);

    field public static final java.lang.String SERVICE_INTERFACE = "android.permissionpresenterservice.RuntimePermissionPresenterService";

  }

core/java/android/content/pm/PackageItemInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.FloatRange; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -104,7 +103,7 @@ public class PackageItemInfo { 
    private static volatile boolean sForceSafeLabels = false;



    /** {@hide} */

    @UnsupportedAppUsage

    @SystemApi

    public static void setForceSafeLabels(boolean forceSafeLabels) {

        sForceSafeLabels = forceSafeLabels;

    }

core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.permissionpresenterservice;



import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.app.Service;

import android.content.Context;

import android.content.Intent;
@@ -78,10 +77,7 @@ public abstract class RuntimePermissionPresenterService extends Service { 
     *

     * @param packageName The package for which to revoke

     * @param permissionName The permission to revoke

     *

     * @hide

     */

    @UnsupportedAppUsage

    public abstract void onRevokeRuntimePermission(String packageName, String permissionName);



    @Override

packages/SettingsLib/res/drawable/ic_info.xml→core/res/res/drawable/ic_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorAccent">

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3486,6 +3486,9 @@ 
    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

    <string name="config_headlineFontFamilyMedium">@string/font_family_button_material</string>



    <!-- Size of icon shown beside a preference locked by admin -->

    <dimen name="config_restricted_icon_size">@dimen/restricted_icon_size_material</dimen>



    <string translatable="false" name="config_batterySaverDeviceSpecificConfig"></string>



    <!-- Package name that should be granted Notification Assistant access -->