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

Commit 34cffe3a authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Make Call.Details.getAssociatedUser @SystemApi"" into main

parents 4183867d 2c14b863

AconfigFlags.bp

+11 −0
Original line number Diff line number Diff line
@@ -240,6 +240,17 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "telecom_flags_core_java_aconfig_java_exported_lib",

    aconfig_declarations: "telecom_flags",

    mode: "exported",

    min_sdk_version: "30",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    apex_available: [

        "com.android.permission",

    ],

}



// Telephony

java_aconfig_library {

    name: "telephony_flags_core_java_lib",

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44103,6 +44103,7 @@ package android.telecom { 
    method public boolean can(int);

    method public static String capabilitiesToString(int);

    method public android.telecom.PhoneAccountHandle getAccountHandle();

    method @FlaggedApi("com.android.server.telecom.flags.call_details_get_associated_user_api") @NonNull public android.os.UserHandle getAssociatedUser();

    method public int getCallCapabilities();

    method public int getCallDirection();

    method public int getCallProperties();

telecomm/framework/java/android/telecom/Call.java

+2 −2
Original line number Diff line number Diff line
@@ -1137,9 +1137,9 @@ public final class Call { 
         * Gets the user that originated the call

         * @return The user

         *

         * @hide

         */

        public UserHandle getAssociatedUser() {

        @FlaggedApi(Flags.FLAG_CALL_DETAILS_GET_ASSOCIATED_USER_API)

        public @NonNull UserHandle getAssociatedUser() {

            return mAssociatedUser;

        }