894884 - B2G RIL: Enable getCardLockRetryCount on emulator

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

We need to enable the quirk RILQUIRKS_HAVE_QUERY_ICC_LOCK_RETRY_COUNT.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Hi Vicamo,

I added some Makefiles to the device/generic/goldfish for setting the RIL quirk, but it doesn't work. The commit is available at

  https://github.com/tdz/device_generic_goldfish/commit/07d42fea01e7f00f8217b7155911ec55d3ec2cc9

The files are parsed by the build system, but the defined property does not show up in the builds 'system/build.prop'. I've seen this working for the phones. Did I miss something? Or is there a major difference between the emulator and the phone's build systems that causes this problem?

Comment 2

[Vicamo Yang [:vicamo][:vyang]]

Hi Thomas,

Emulator variants' product files are located in https://github.com/mozilla-b2g/platform_build/tree/master/target/product/ .  We're using |full.mk| for emulator and |full_x86.mk| emulator-x86.  But Unagi also inherits |full.mk|[1] as well, so having that overriding on inheritance path of |full.mk| might be a bad idea.

To add read-only properties, we have ADDITIONAL_DEFAULT_PROPERTIES (installed to /default.prop) and ADDITIONAL_BUILD_PROPERTIES (installed to /system/build.prop).  Both are affected by ordinary |Android.mk| files.  So you can simply have following code in device/generic/goldfish/Android.mk:

  ADDITIONAL_DEFAULT_PROPERTIES += \
    ro.moz.ril.have_query_icc_lock_retry_count=true \
    $(NULL)

[1]: https://github.com/mozilla-b2g/android-device-unagi/blob/master/full_unagi.mk#L11

Comment 3

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: https://github.com/mozilla-b2g/device_generic_goldfish/pull/3

Thanks for your help, Vicamo. This makefile sets the property correctly.

The whole thing was quite painful. After I set property it still didn't work for an unknown reason. I finally figured out that Android's init filters out all properties with names longer then 32 characters. So I also had to shorten the string bit.

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Bug 894884: Use ro.moz.ril.query_icc_count property

This is the Gecko change for the new property name.

Comment 5

[Vicamo Yang [:vicamo][:vyang]]

Comment on attachment 777859 [details] [diff] [review]
Bug 894884: Use ro.moz.ril.query_icc_count property

Review of attachment 777859 [details] [diff] [review]:
-----------------------------------------------------------------

Sorry I forgot that 32 chars limit.  Thank you :)

Comment 6

[Vicamo Yang [:vicamo][:vyang]]

Comment on attachment 777858 [details]
https://github.com/mozilla-b2g/device_generic_goldfish/pull/3

Actually I said |Android.mk|, not |AndroidProducts.mk|.  Anyway, this PR has been merged and I just had another fix to correct this.

Comment 7

[Vicamo Yang [:vicamo][:vyang]]

Merged on GitHub:
https://github.com/mozilla-b2g/device_generic_goldfish/commit/c4818ca4fb20de096a2937337be44edaaf1072e8
https://github.com/mozilla-b2g/device_generic_goldfish/commit/e3fd3bec74036de3d2e587e42581cb8715715b68

Comment 8

[Vicamo Yang [:vicamo][:vyang]]

Please check-in attachment 777859 [details] [diff] [review] after g-m-o[1] has picked up device/generic/goldfish merges.

[1]: http://git.mozilla.org/?p=b2g/device_generic_goldfish.git;a=summary

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Vicamo Yang [:vicamo][:vyang] from comment #6)
> Comment on attachment 777858 [details]
> https://github.com/mozilla-b2g/device_generic_goldfish/pull/3
> 
> Actually I said |Android.mk|, not |AndroidProducts.mk|.  Anyway, this PR has
> been merged and I just had another fix to correct this.

Oops :( Thanks for fixing this.

Comment 10

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Thanks Vicamo.

https://hg.mozilla.org/projects/birch/rev/21200bb2eaf0

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/21200bb2eaf0