Commit Graph

48470 Commits

Author SHA1 Message Date
Alan Viverette
88bba269c6 am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
* commit 'd425e2d7204fbab1ac1c33fa6f2cd9d557654142':
  Call dispatchFinishTemporaryDetach before returning a transient view
2015-06-03 19:18:26 +00:00
Jonathan Basseri
5257e92f26 am f28ab7a7: am f270a8f3: Fix logic error in CarrierService.
* commit 'f28ab7a75b87eede9a051b736b79cc9d598219a1':
  Fix logic error in CarrierService.
2015-06-03 19:18:11 +00:00
Jonathan Basseri
4b97a3fe01 am cc00587c: am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev
* commit 'cc00587c04f853d7c85c78893462c0f43781f17d':
  Fix logic error in CarrierService.
2015-06-03 19:18:06 +00:00
Filip Gruszczynski
3dc18c5788 am da992dee: am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
* commit 'da992deeb8413f84cc978f615272dd3ff6ef61a2':
  Fix NPE when requesting outsets for detached view.
2015-06-03 18:49:18 +00:00
Yohei Yukawa
fd417eb405 am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
* commit '5acad9323ad656977ca0d10fd4ebe5f4a661e8e4':
  Convert subtypes whose locale is "tl" to "fil".
2015-06-03 18:49:04 +00:00
Alex Klyubin
38012dba5c am 0623bc8a: am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit '0623bc8ae2903ea49590b127a04c3c3952655aed':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-03 18:48:58 +00:00
Alex Klyubin
b4f06ff335 am 0643449d: am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit '0643449dc645cdbc25f8abba0500ecfd16cd7dc7':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-03 18:47:31 +00:00
Alan Viverette
4a7bb4624f Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 2015-06-03 18:28:50 +00:00
Jonathan Basseri
f270a8f3d6 Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.

This was tricky to track down because clients get no clear signal that
onBind is returning null.

Bug: 21571360
Change-Id: Id82fce8dfa73a75fae1ce69f73b922addc7daa3e
2015-06-03 11:19:35 -07:00
Jonathan Basseri
13abe77f53 Merge "Fix logic error in CarrierService." into mnc-dev 2015-06-03 18:16:06 +00:00
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Yoshiki Iguchi
c4c59bc894 am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
* commit '54da4c981b11211f39682511749bcb24f0a397fe':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
2015-06-03 17:46:16 +00:00
Shawn Willden
68f17203b2 am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev
* commit 'b183fdca615e847ed03389905b0a30e30d9d37c5':
  Track changes to the keystore binder API
2015-06-03 17:45:45 +00:00
Filip Gruszczynski
e660d4e96a Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
2015-06-03 10:43:48 -07:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Alan Viverette
6c413ce638 Call dispatchFinishTemporaryDetach before returning a transient view
ListView caches transient state views for reuse during layout, which calls
dispatchStartTemporaryDetach() before caching the view. This should always
be followed by a corresponding dispatchFinishTemporaryDetach() before
removing the view from the cache and returning it for reuse. While this
was the case for other types of cached views, we missed this call for
views placed in one of the two transient view caches.

Bug: 17387206
Change-Id: I360945006558b2783c098183a7cc9bc28d05d9ab
2015-06-03 10:35:44 -07:00
Jonathan Basseri
c0e7a0416d Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.

This was tricky to track down because clients get no clear signal that
onBind is returning null.

Bug: 21571360
Change-Id: If37a52e30d0c7fd0205f23595f39be3d55db69d4
2015-06-03 10:29:39 -07:00
Alex Klyubin
85f4b7b38c Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 17:25:38 +00:00
Alex Klyubin
4699e43dc6 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-03 09:36:51 -07:00
Alex Klyubin
5c56f74527 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 16:35:21 +00:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Seigo Nonaka
12eaf366f9 am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev
* commit '031aead10a77d0a0ffed9ede8d3edef87f28122f':
  Use final in favor of initialization safety.
2015-06-03 05:21:26 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
2015-06-03 04:53:44 +00:00
Casper Bonde
8b8af64d84 am 80233cda: am 2328423d: Add support for MITM for BluetoothSockets (1/4)
* commit '80233cdabb31800fbe2d9d64eb2033fe5ab7e5e6':
  Add support for MITM for BluetoothSockets (1/4)
2015-06-03 04:10:20 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:40 +00:00
Erik Kline
4d51105164 am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
* commit '43a2c8ff4251039810c09fa5d52bfe40834f265b':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:23:12 +00:00
Svetoslav
f766363a36 am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
  Add annotations to a new API
2015-06-03 02:22:58 +00:00
Jun Mukai
c891bfbb11 am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
* commit '7f0ad420f435da9b57c2911d61803b52adeca528':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 02:22:47 +00:00
Roozbeh Pournader
241ba8684f am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev
* commit '085b657d856e87d884b5d80a7c0d83b735e48c1b':
  Load hyphenation data for more languages.
2015-06-03 02:22:42 +00:00
Casper Bonde
04b892809b am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4)
* commit '0cc2389180db98b93fa24767430d385766ae1378':
  SAP: Change to use new SDP Api (4/4)
2015-06-03 02:22:25 +00:00
Alan Viverette
14d8afc62f am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
* commit '4156c8709bc46d48fb2a92ca580100308f68210d':
  API review feedback for ThemedSpinnerAdapter, Spinner
2015-06-03 02:22:09 +00:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07 Merge "Load hyphenation data for more languages." into mnc-dev 2015-06-03 00:56:24 +00:00
Yohei Yukawa
92280cd309 Convert subtypes whose locale is "tl" to "fil".
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".

For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.

In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor.  In this CL, we do replace
"tl" with "fil" by ourselves.

This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.

This CL is based on the investigation by Narayan Kamath and his
patch.

Bug: 20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
2015-06-02 17:09:50 -07:00
Casper Bonde
da177bb5a0 SAP: Change to use new SDP Api (4/4)
Added class to carry SAP SDP record data.

Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 00:04:37 +00:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Jorim Jaggi
ecfeefb483 am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
* commit 'f7f90276a1f262c0db855edc49d544e157bc6e7f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
2015-06-02 22:49:06 +00:00
Nicolas Prevot
8a4dbac598 am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5 am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
  Fix java doc
2015-06-02 22:28:42 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Svetoslav
12e7abc659 am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
  Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -07:00