Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,221 Commits 3 Branches 0 Tags
b79ac367ad7f082d0ba412cfeee6b451a72ebb97
Commit Graph

48896 Commits

Author SHA1 Message Date
Alan Viverette
b79ac367ad am 88bba269: am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 
* commit '88bba269c64b1bfc2ea2ce38bf6cdd9fcd4deccb':
  Call dispatchFinishTemporaryDetach before returning a transient view
 2015-06-03 22:23:58 +00:00
Jonathan Basseri
6a65b2101d am 5257e92f: am f28ab7a7: am f270a8f3: Fix logic error in CarrierService. 
* commit '5257e92f2631f7fb3650a4c4e05dfa2ab773bcd9':
  Fix logic error in CarrierService.
 2015-06-03 22:23:52 +00:00
Jonathan Basseri
fe92dd2179 am 4b97a3fe: am cc00587c: am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev 
* commit '4b97a3fe01d8718c1e7833a3a4d26f7b11bfeb6a':
  Fix logic error in CarrierService.
 2015-06-03 22:23:47 +00:00
Filip Gruszczynski
e31aba5ec4 am 3dc18c57: am da992dee: am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 
* commit '3dc18c57882af97689248450500c30b969ca81cc':
  Fix NPE when requesting outsets for detached view.
 2015-06-03 22:22:43 +00:00
Yohei Yukawa
3adf706c2c am fd417eb4: am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 
* commit 'fd417eb40557be9e780e4739d35fb5b2ec62a705':
  Convert subtypes whose locale is "tl" to "fil".
 2015-06-03 22:22:31 +00:00
Alex Klyubin
2c892a6541 am 38012dba: am 0623bc8a: am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 
* commit '38012dba5c2f417e25b8d6aa23e64dd5bf987bea':
  Fix block mode numbering (CTR got added as 4 rather than 3)
 2015-06-03 22:22:26 +00:00
Alex Klyubin
7ff6121b87 am b4f06ff3: am 0643449d: am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 
* commit 'b4f06ff3353b931a33cac5fef499c15f08151520':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
 2015-06-03 22:21:31 +00:00
Yoshiki Iguchi
bce3ea3617 am c4c59bc8: am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 
* commit 'c4c59bc894f1f1b268072c8387e1faa71b3ff1b1':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
 2015-06-03 19:23:00 +00:00
Shawn Willden
0002c54595 am 68f17203: am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev 
* commit '68f17203b20a29858b3f7dcefbdf89b8a3b2010f':
  Track changes to the keystore binder API
 2015-06-03 19:22:48 +00:00
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
Seigo Nonaka
0e96884382 am 12eaf366: am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev 
* commit '12eaf366f963f883d89d0713b458c698c514ab96':
  Use final in favor of initialization safety.
 2015-06-03 17:36:30 +00:00
Casper Bonde
919331dfcc am 8b8af64d: am 80233cda: am 2328423d: Add support for MITM for BluetoothSockets (1/4) 
* commit '8b8af64d84f7ac88ad68f367babdffc664d48cb4':
  Add support for MITM for BluetoothSockets (1/4)
 2015-06-03 17:36:17 +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
Paul Crowley
8692b7e5a1 Merge "Use mount service to create user dirs." 2015-06-03 12:54:00 +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
2e54aed72b am 4d511051: am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 
* commit '4d51105164c0d15be361ea7bbe388cebfdc98c7c':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
 2015-06-03 02:36:54 +00:00
Svetoslav
720e431603 am f766363a: am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev 
* commit 'f766363a36ec6e6ef57288520fb99d9a9a680f47':
  Add annotations to a new API
 2015-06-03 02:36:43 +00:00
Jun Mukai
8acf610a70 am c891bfbb: am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 
* commit 'c891bfbb11522bbc60451eaa81dabf77f6180170':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
 2015-06-03 02:36:32 +00:00
Roozbeh Pournader
151ce159fd am 241ba868: am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev 
* commit '241ba8684f6bb543bd4eb06a8b95312f784a6638':
  Load hyphenation data for more languages.
 2015-06-03 02:36:27 +00:00
Casper Bonde
e993885fe2 am 04b89280: am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4) 
* commit '04b892809b90858718bf9f35b83a5793d7249add':
  SAP: Change to use new SDP Api (4/4)
 2015-06-03 02:36:15 +00:00
Alan Viverette
d03a54140d am 14d8afc6: am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 
* commit '14d8afc62f8665def5daec10b6abdf8dc7d52d76':
  API review feedback for ThemedSpinnerAdapter, Spinner
 2015-06-03 02:36:04 +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