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

Commit bc6a8477 authored by Sukesh Ram's avatar Sukesh Ram Committed by Automerger Merge Worker
Browse files

Merge "Revert "Improve StatusBarManager disable*() apis"" into 24D1-dev am: 76bee04c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27301281



Change-Id: I86e22e504e3563c40361022ad09758f26c4acd62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents faece028 76bee04c

core/api/system-current.txt

+1 −4
Original line number Diff line number Diff line
@@ -1143,16 +1143,13 @@ package android.app { 
    field public static final int NAV_BAR_MODE_KIDS = 1; // 0x1

  }













  public static final class StatusBarManager.DisableInfo implements android.os.Parcelable {













  public static final class StatusBarManager.DisableInfo {















    method public boolean areAllComponentsEnabled();













    method public int describeContents();















    method public boolean isNavigateToHomeDisabled();















    method public boolean isNotificationPeekingDisabled();















    method public boolean isRecentsDisabled();















    method public boolean isSearchDisabled();















    method public boolean isStatusBarExpansionDisabled();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.app.StatusBarManager.DisableInfo> CREATOR;















  }





























  public final class SystemServiceRegistry {

























core/api/system-lint-baseline.txt



+0
−4




























Original line number
Diff line number
Diff line








@@ -1939,10 +1939,6 @@ UnflaggedApi: android.app.ActivityManager#getExternalHistoricalProcessStartReaso













    New API must be flagged with @FlaggedApi: method android.app.ActivityManager.getExternalHistoricalProcessStartReasons(String,int)















UnflaggedApi: android.app.AppOpsManager#OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO:















    New API must be flagged with @FlaggedApi: field android.app.AppOpsManager.OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO













UnflaggedApi: android.app.StatusBarManager.DisableInfo#CREATOR:













    New API must be flagged with @FlaggedApi: field android.app.StatusBarManager.DisableInfo.CREATOR













UnflaggedApi: android.app.StatusBarManager.DisableInfo#isBackDisabled():













    New API must be flagged with @FlaggedApi: method android.app.StatusBarManager.DisableInfo.isBackDisabled()















UnflaggedApi: android.companion.virtual.VirtualDeviceManager.VirtualDevice#getPersistentDeviceId():















    New API must be flagged with @FlaggedApi: method android.companion.virtual.VirtualDeviceManager.VirtualDevice.getPersistentDeviceId()















UnflaggedApi: android.content.Context#THREAD_NETWORK_SERVICE:

































core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -463,7 +463,7 @@ package android.app {













    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void togglePanel();















  }





























  public static final class StatusBarManager.DisableInfo implements android.os.Parcelable {













  public static final class StatusBarManager.DisableInfo {















    method public boolean isRotationSuggestionDisabled();















  }

















































core/java/android/app/StatusBarManager.aidl
deleted100644 → 0



+0
−19




























Original line number
Diff line number
Diff line













/**













 * Copyright (c) 2024, The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *     http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.app;



























parcelable StatusBarManager.DisableInfo;










 No newline at end of file
























core/java/android/app/StatusBarManager.java



+48
−392


























File changed.
Preview size limit exceeded, changes collapsed.