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

53254 Commits

Author SHA1 Message Date
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
Abodunrinwa Toki
42a6b07886 am 60416891: am 24a28fa6: am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 
* commit '60416891d2c02816897d1d70dfd22536d590d4ed':
  Fix FloatingToolbar positioning for RTL.
 2015-06-03 22:22:37 +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
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
Abodunrinwa Toki
60416891d2 am 24a28fa6: am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 
* commit '24a28fa62919a82ced1371ea7fdc6c1091bb0273':
  Fix FloatingToolbar positioning for RTL.
 2015-06-03 18:49:09 +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
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Abodunrinwa Toki
96e727d1e6 Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 2015-06-03 17:47:47 +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
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
Abodunrinwa Toki
6cb5cc19d4 Fix FloatingToolbar positioning for RTL. 
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.

-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.

Bug:21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
 2015-06-03 16:24:52 +01: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
Andres Morales
ef10809f47 am 595bc35d: am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev 
* commit '595bc35d70fe59f1a090686630f2b378190587ca':
  [LockSettings] migrate patterns to be indexed at '1'
 2015-06-03 02:36:38 +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
Andres Morales
595bc35d70 am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev 
* commit 'a2a736500cfe12de2c9efbcb5b14854ab7183b82':
  [LockSettings] migrate patterns to be indexed at '1'
 2015-06-03 02:22:53 +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
Andres Morales
8f589d01d1 Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev 2015-06-03 01:01:18 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API 
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
 2015-06-02 17:59:31 -07:00