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

Commit f8458ff9 authored by Wink Saville's avatar Wink Saville
Browse files

Fix lpdk build. 

Move aidl files from frameworks/opt/net/ims to frameworks/base so lpdk
compiles. The reason is lpdk doesn't have frameworks/base sources so
references to Pending and Bundle in aidl files breaks the pdk build.

I had to move all of them and the ims/*java files for dependency reasons.

Change-Id: I92452562591b157cecdfc01bcd892c4f35f5965c
parent 226a5195

Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,13 @@ LOCAL_SRC_FILES += \ 
	telecomm/java/com/android/internal/telecomm/IInCallService.aidl \

	telecomm/java/com/android/internal/telecomm/ITelecommService.aidl \

	telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.aidl \

	telephony/java/com/android/ims/internal/IImsCallSession.aidl \

	telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl \

	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl \

	telephony/java/com/android/ims/internal/IImsService.aidl \

	telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \

	telephony/java/com/android/ims/internal/IImsUt.aidl \

	telephony/java/com/android/ims/internal/IImsUtListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	telephony/java/com/android/internal/telephony/ITelephony.aidl \

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes/android/app/maintenance)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/android/app/maintenance)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

telephony/java/com/android/ims/ImsCallForwardInfo.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 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 com.android.ims;



parcelable ImsCallForwardInfo;

telephony/java/com/android/ims/ImsCallForwardInfo.java

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 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 com.android.ims;



import android.os.Parcel;

import android.os.Parcelable;



/**

 * Provides the call forward information for the supplementary service configuration.

 *

 * @hide

 */

public class ImsCallForwardInfo implements Parcelable {

    // Refer to ImsUtInterface#CDIV_CF_XXX

    public int mCondition;

    // 0: disabled, 1: enabled

    public int mStatus;

    // 0x91: International, 0x81: Unknown

    public int mToA;

    // Number (it will not include the "sip" or "tel" URI scheme)

    public String mNumber;

    // No reply timer for CF

    public int mTimeSeconds;



    public ImsCallForwardInfo() {

    }



    public ImsCallForwardInfo(Parcel in) {

        readFromParcel(in);

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeInt(mCondition);

        out.writeInt(mStatus);

        out.writeInt(mToA);

        out.writeString(mNumber);

        out.writeInt(mTimeSeconds);

    }



    @Override

    public String toString() {

        return super.toString() + ", Condition: " + mCondition

            + ", Status: " + ((mStatus == 0) ? "disabled" : "enabled")

            + ", ToA: " + mToA + ", Number=" + mNumber

            + ", Time (seconds): " + mTimeSeconds;

    }



    private void readFromParcel(Parcel in) {

        mCondition = in.readInt();

        mStatus = in.readInt();

        mToA = in.readInt();

        mNumber = in.readString();

        mTimeSeconds = in.readInt();

    }



    public static final Creator<ImsCallForwardInfo> CREATOR =

            new Creator<ImsCallForwardInfo>() {

        @Override

        public ImsCallForwardInfo createFromParcel(Parcel in) {

            return new ImsCallForwardInfo(in);

        }



        @Override

        public ImsCallForwardInfo[] newArray(int size) {

            return new ImsCallForwardInfo[size];

        }

    };

}

telephony/java/com/android/ims/ImsCallProfile.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 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 com.android.ims;



parcelable ImsCallProfile;