summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-032-2/+2
|\ | | | | | | | | * commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1': Track change to Conscrypt
| * Merge "Track change to Conscrypt"Kenny Root2014-11-032-2/+2
| |\
| | * Track change to ConscryptKenny Root2014-10-312-2/+2
| | | | | | | | | | | | | | | | | | | | | Change way in which an outside caller can get the preferred SSLContext. Bug: 17136008 Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
* | | am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '5f8099ed181c2ba279c4a747096442389d5f8840': Add java.util.List import.
| * | Add java.util.List import.Narayan Kamath2014-11-031-0/+1
| | | | | | | | | | | | | | | | | | Unused on master but used downstream. Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
* | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-77/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735': Revert "Revert "Remove unused apache related API.""
| * | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-77/+0
| |/ | | | | | | | | | | This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea. Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
* | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
|\ \ | |/ | | | | | | * commit 'e87d36f8925a34f85ba80c886757d07ad03fed42': Revert "Remove unused apache related API."
| * Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+77
| | | | | | | | | | | | This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14. Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
* | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-35/+0
|\ \ | |/ | | | | Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
| * Remove unused apache related API.Narayan Kamath2014-10-241-77/+0
| | | | | | | | | | | | Hidden and used only in unit tests. Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
* | am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-282-5/+5
|\ \ | |/ | | | | | | * commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba': Migrate off timeFormat12 and timeFormat24.
| * Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-232-5/+5
| |\
| | * Migrate off timeFormat12 and timeFormat24.Elliott Hughes2014-10-232-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcore now offers a wider variety of 12-/24-hour time formats, so be more specific about which one we want here. (cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.) Bug: 10361358 Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
* | | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-201-12/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
| * \ \ am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to ↵Neil Fuller2014-10-201-12/+31
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Math" * commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51': Replacing FloatMath native implementation with calls to Math
| | * | Merge "Replacing FloatMath native implementation with calls to Math"Neil Fuller2014-10-201-12/+31
| | |\ \
| | | * | Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-201-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
* | | | | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native ↵Elliott Hughes2014-10-181-7/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | implementation with calls to Math"" * commit '84e6d466edc2aba711f90431a1cd209d11c0e70d': Revert "Replacing FloatMath native implementation with calls to Math"
| * | | | am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with ↵Elliott Hughes2014-10-181-7/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | calls to Math"" * commit '4cd671e4d27befdd576fa86051956c3cafad6808': Revert "Replacing FloatMath native implementation with calls to Math"
| | * | | Merge "Revert "Replacing FloatMath native implementation with calls to Math""Elliott Hughes2014-10-181-7/+4
| | |\ \ \
| | | * | | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-181-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32b88b48daa7383880088246d7222dd93cf55285. Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
* | | | | | am 15e7b2ac: Merge "Translate compound button drawable by scroll position" ↵Alan Viverette2014-10-181-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e': Translate compound button drawable by scroll position
| * \ \ \ \ \ Merge "Translate compound button drawable by scroll position" into lmp-devAlan Viverette2014-10-181-1/+9
| |\ \ \ \ \ \
| | * | | | | | Translate compound button drawable by scroll positionAlan Viverette2014-10-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18028674 Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
* | | | | | | | am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" ↵Jim Miller2014-10-171-7/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24': Add utility methods to LockPatternUtils for encryption
| * | | | | | | Merge "Add utility methods to LockPatternUtils for encryption" into lmp-devJim Miller2014-10-171-7/+17
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Add utility methods to LockPatternUtils for encryptionJim Miller2014-10-171-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables a change in Settings that allows device encryption to be disabled by the user. Fixes bug 17881324 Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
* | | | | | | | am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." ↵Svetoslav2014-10-171-31/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c': Accessibility no longer overrides strong encryption.
| * | | | | | | Merge "Accessibility no longer overrides strong encryption." into lmp-devSvetoslav2014-10-171-31/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Accessibility no longer overrides strong encryption.Svetoslav2014-10-171-31/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the accessibility layer behavior to reflect the new model where accessibility no longer overrides strong encryption. Now enabling an accessibility service lowers the encryption level but the user can bump it up in settings if desired. bug:17881324 Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
* | | | | | | | am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into ↵William Bourke2014-10-171-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '84b4791aaf0384a334068a97c70fcda162cfadab': Modified lollipop Easter egg for TV compatibility
| * | | | | | | Modified lollipop Easter egg for TV compatibilityWilliam Bourke2014-10-171-0/+24
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17997922 Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
* | | | | | | am a865bb5d: Merge "Use the correct method to check if device is encrypted" ↵Amith Yamasani2014-10-171-4/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'a865bb5df834194dee339db615c17d7c7b63aaa3': Use the correct method to check if device is encrypted
| * | | | | | Merge "Use the correct method to check if device is encrypted" into lmp-devAmith Yamasani2014-10-171-4/+1
| |\ \ \ \ \ \
| | * | | | | | Use the correct method to check if device is encryptedAmith Yamasani2014-10-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DPM's method will return false if encrypted by default password, preventing the changing of encryption password to lockscreen password. Check if the device is encrypted by some means, instead. Also fix a SecurityException when Device Admin queries encryption state (recent regression) Bug: 17881324 Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
* | | | | | | | am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-devDianne Hackborn2014-10-171-0/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '52476989b8afc0e96c2218625031ed550b12c79b': SDK only: hide the old L API version constant.
| * | | | | | | SDK only: hide the old L API version constant.Dianne Hackborn2014-10-161-0/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the LOLLIPOP version constant to describe more things that change when you target it. Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
* | | | | | | am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"Neil Fuller2014-10-171-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7': Removing some more FloatMath references
| * | | | | | am c7aa8fe6: Merge "Removing some more FloatMath references"Neil Fuller2014-10-171-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f': Removing some more FloatMath references
| | * | | | | Merge "Removing some more FloatMath references"Neil Fuller2014-10-171-1/+1
| | |\ \ \ \ \
| | | * | | | | Removing some more FloatMath referencesNeil Fuller2014-10-151-1/+1
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e for details. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I46d4ee4c4be7972e3bcc6782fb50f024b6fff1ee
* | | | | | | am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()Prerepa Viswanadham2014-10-161-2/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '248edc3e969217aec1fcce7f324cbae6c46da0a3': Update javadoc comments for getBluetoothLeAdvertiser()
| * | | | | | Update javadoc comments for getBluetoothLeAdvertiser()Prerepa Viswanadham2014-10-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To clarify that BluetoothLeAdvertiser object will return null when BT is off OR if the hw doesn't support these capabilities bug: 18006072 Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
* | | | | | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-161-4/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit '8a3785cafec4b47fe8d61614b04a0e193d616428': Replacing FloatMath native implementation with calls to Math
| * | | | | | am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to ↵Neil Fuller2014-10-161-4/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Math" * commit 'fd2d41b742339d278f4a66f78a7c161108985ed8': Replacing FloatMath native implementation with calls to Math
| | * | | | | Merge "Replacing FloatMath native implementation with calls to Math"Neil Fuller2014-10-161-4/+7
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Replacing FloatMath native implementation with calls to MathNeil Fuller2014-10-151-4/+7
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
* | | | | | am 20de619d: Merge "Set threads\' contextClassLoader during ↵Brian Carlstrom2014-10-161-1/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadedApk.makeApplication." into lmp-dev * commit '20de619d66a594fd9e6e76a3a2cb79422aef577c': Set threads' contextClassLoader during LoadedApk.makeApplication.
| * | | | | Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." ↵Brian Carlstrom2014-10-161-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-dev
generated by cgit v1.1 at 2025-01-23 12:39:10 +0000