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

Commit e479728f authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Do not use @SystemApi(client = MODULE_APPS) (documents/settings) 

There will be no special protection mechanisms around MODULE_APPS,
so we're going to remove it for now.

All the MODULE_APPS should be protected with a permission, etc, so
the change should be safe.

Bug: 148177503
Test: Build / treehugger
Change-Id: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
parent d4b9d902

api/module-app-current.txt

+0 −20
Original line number Diff line number Diff line 
// Signature format: 2.0
 
package android.app {



  public final class NotificationChannel implements android.os.Parcelable {

    method public void setBlockableSystem(boolean);

  }



}



package android.provider {



  public final class DocumentsContract {

    method @NonNull public static android.net.Uri buildDocumentUriAsUser(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    field public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";

  }



}

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ package android.app { 
    method public int getUserLockedFields();

    method public boolean isDeleted();

    method public void populateFromXml(org.xmlpull.v1.XmlPullParser);

    method public void setBlockableSystem(boolean);

    method public org.json.JSONObject toJson() throws org.json.JSONException;

    method public void writeXml(org.xmlpull.v1.XmlSerializer) throws java.io.IOException;

    field public static final int USER_LOCKED_SOUND = 32; // 0x20
@@ -9411,6 +9412,7 @@ package android.provider { 
  }















  public final class DocumentsContract {













    method @NonNull public static android.net.Uri buildDocumentUriAsUser(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);















    method public static boolean isManageMode(@NonNull android.net.Uri);















    method @NonNull public static android.net.Uri setManageMode(@NonNull android.net.Uri);















    field public static final String ACTION_DOCUMENT_ROOT_SETTINGS = "android.provider.action.DOCUMENT_ROOT_SETTINGS";










@@ -9571,6 +9573,7 @@ package android.provider {













    field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";















    field public static final String CARRIER_APP_NAMES = "carrier_app_names";















    field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";













    field public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";















    field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";















    field public static final String DEVICE_DEMO_MODE = "device_demo_mode";















    field public static final String DEVICE_PROVISIONING_MOBILE_DATA_ENABLED = "device_provisioning_mobile_data";

























core/java/android/app/NotificationChannel.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -15,8 +15,6 @@













 */















package android.app;





























import static android.annotation.SystemApi.Client.MODULE_APPS;





























import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.annotation.TestApi;










@@ -362,7 +360,7 @@ public final class NotificationChannel implements Parcelable {













     * @param blockableSystem if {@code true}, allows users to block notifications on this channel.















     * @hide















     */













    @SystemApi(client = MODULE_APPS)













    @SystemApi















    @TestApi















    public void setBlockableSystem(boolean blockableSystem) {















        mBlockableSystem = blockableSystem;

































core/java/android/provider/DocumentsContract.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -16,8 +16,6 @@





























package android.provider;





























import static android.annotation.SystemApi.Client.MODULE_APPS;





























import static com.android.internal.util.Preconditions.checkCollectionElementsNotNull;















import static com.android.internal.util.Preconditions.checkCollectionNotEmpty;


























@@ -955,7 +953,7 @@ public final class DocumentsContract {













     *















     * @hide















     */













    @SystemApi(client = MODULE_APPS)













    @SystemApi















    @NonNull















    public static Uri buildDocumentUriAsUser(















            @NonNull String authority, @NonNull String documentId, @NonNull UserHandle user) {

































core/java/android/provider/Settings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -14051,7 +14051,7 @@ public final class Settings {













         * means Common Criteria mode is enabled.















         * @hide















         */













        @SystemApi(client = SystemApi.Client.MODULE_APPS)













        @SystemApi















        public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";















    }