Re: frameworks/base out of date, needs merge with upstream

[William Roberts <bill.c.roberts@xxxxxxxxx>]

Same thing with Settings....

I think you need to have a merge party

On Fri, Jul 20, 2012 at 12:03 AM, William Roberts <bill.c.roberts@xxxxxxxxx> wrote:

Build is broken:

frameworks/opt/telephony/src/java/com/android/internal/telephony/TelephonyCapabilities.java:140: cannot find symbol

symbol  : variable PhoneConstants

location: class com.android.internal.telephony.TelephonyCapabilities

                || (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP));

                                            ^

frameworks/opt/telephony/src/java/com/android/internal/telephony/TelephonyCapabilities.java:158: cannot find symbol

symbol  : variable PhoneConstants

location: class com.android.internal.telephony.TelephonyCapabilities

        return ((phone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM)

                                         ^

frameworks/opt/telephony/src/java/com/android/internal/telephony/TelephonyCapabilities.java:159: cannot find symbol

symbol  : variable PhoneConstants

location: class com.android.internal.telephony.TelephonyCapabilities

                || (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP));

                                            ^

frameworks/opt/telephony/src/java/com/android/internal/telephony/TelephonyCapabilities.java:179: cannot find symbol

symbol  : variable PhoneConstants

location: class com.android.internal.telephony.TelephonyCapabilities

        return phoneType == PhoneConstants.PHONE_TYPE_GSM;

That is just some of them, it looks like we need to update your seandroid branch with master.

They moved a bunch of telephony code to frameworks/opt/telephony to create a common code base..

--
Respectfully,

William C Roberts

--
Respectfully,

William C Roberts