OSDN Git Service
Dong Zhou [Wed, 18 Mar 2015 18:23:45 +0000 (18:23 +0000)]
am
58ba39ed: am
94573dc5: am
89f41eb3: Define the capability to speed up MT call audio
* commit '
58ba39ed86798c3d0877e0ed6bdf09c74007c36f':
Define the capability to speed up MT call audio
Kenny Root [Wed, 18 Mar 2015 18:20:30 +0000 (11:20 -0700)]
resolved conflicts for merge of
c3f497ae to lmp-mr1-dev-plus-aosp
Kenny Root [Wed, 18 Mar 2015 17:26:11 +0000 (10:26 -0700)]
resolved conflicts for merge of
fb9ff42d to lmp-mr1-dev-plus-aosp
Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
Dong Zhou [Wed, 18 Mar 2015 16:54:37 +0000 (16:54 +0000)]
am
94573dc5: am
89f41eb3: Define the capability to speed up MT call audio
* commit '
94573dc5515d69458effc92b66922f757adde4d0':
Define the capability to speed up MT call audio
Kenny Root [Wed, 18 Mar 2015 16:54:33 +0000 (16:54 +0000)]
am
4ff668d4: Track change to Conscrypt
* commit '
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
Track change to Conscrypt
Kenny Root [Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)]
am
fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
* commit '
fbd8805cd783e34aebf521913aeab6cfd483b7b2':
Track change to Conscrypt
Geoff Mendal [Wed, 18 Mar 2015 15:43:02 +0000 (15:43 +0000)]
am
c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:00:13 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 12:54:48 +0000 (12:54 +0000)]
am
8d889a67: (-s ours) Import translations. DO NOT MERGE
* commit '
8d889a67d079200fac0530542f48dd1d2fdedc4e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:47:44 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import
Dong Zhou [Tue, 17 Mar 2015 22:28:22 +0000 (22:28 +0000)]
am
89f41eb3: Define the capability to speed up MT call audio
* commit '
89f41eb39e910e220957ac861651ead17eff9085':
Define the capability to speed up MT call audio
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt
(cherry picked from commit
9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)
Bug:
19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
Kenny Root [Tue, 17 Mar 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio
Bug:
19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
Andreas Gampe [Tue, 17 Mar 2015 21:43:01 +0000 (21:43 +0000)]
am
28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"
* commit '
28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555':
Frameworks/base: Make IDENTITY_MATRIX final
Andreas Gampe [Tue, 17 Mar 2015 21:42:55 +0000 (21:42 +0000)]
am
9568772a: Merge "Frameworks/base: Fix format string in Geofence"
* commit '
9568772acbf5b36f2edb41f7c5b06d499329add0':
Frameworks/base: Fix format string in Geofence
Andreas Gampe [Tue, 17 Mar 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Frameworks/base: Make IDENTITY_MATRIX final"
Andreas Gampe [Mon, 16 Mar 2015 01:55:33 +0000 (18:55 -0700)]
Frameworks/base: Make IDENTITY_MATRIX final
Bug:
19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
Andreas Gampe [Tue, 17 Mar 2015 21:30:49 +0000 (21:30 +0000)]
Merge "Frameworks/base: Fix format string in Geofence"
Andreas Gampe [Sun, 15 Mar 2015 21:49:15 +0000 (14:49 -0700)]
Frameworks/base: Fix format string in Geofence
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.
Bug:
19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit
8a970637208207955fb6a719bd82902384b3c743)
Bug:
19798387
Bug:
17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Andreas Gampe [Tue, 17 Mar 2015 21:05:48 +0000 (21:05 +0000)]
am
aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '
aae42eb26176482b09f0846e6acf7efa844a0d23':
Frameworks/base: Fix format string in Camera
Andreas Gampe [Tue, 17 Mar 2015 20:52:20 +0000 (20:52 +0000)]
Merge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Sun, 15 Mar 2015 21:43:31 +0000 (14:43 -0700)]
Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.
Bug:
19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
Andreas Gampe [Tue, 17 Mar 2015 20:49:18 +0000 (20:49 +0000)]
am
be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit '
be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
Frameworks/base: Fix precedence bug
Filip Gruszczynski [Tue, 17 Mar 2015 20:44:58 +0000 (20:44 +0000)]
am
7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
* commit '
7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
Add animation to zeroing burn in protection.
Andreas Gampe [Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)]
am
0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '
0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
Andreas Gampe [Tue, 17 Mar 2015 20:40:58 +0000 (20:40 +0000)]
am
4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '
4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Andreas Gampe [Tue, 17 Mar 2015 20:36:21 +0000 (20:36 +0000)]
Merge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Sun, 15 Mar 2015 20:59:50 +0000 (13:59 -0700)]
Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.
Bug:
19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
Andreas Gampe [Tue, 17 Mar 2015 20:28:52 +0000 (20:28 +0000)]
Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Mon, 16 Mar 2015 03:32:22 +0000 (20:32 -0700)]
Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.
Bug:
19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
Andreas Gampe [Tue, 17 Mar 2015 20:25:20 +0000 (20:25 +0000)]
Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Sun, 15 Mar 2015 22:21:25 +0000 (15:21 -0700)]
Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug:
19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
Brian Carlstrom [Tue, 17 Mar 2015 19:44:55 +0000 (19:44 +0000)]
am
d8507e3a: am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
d8507e3aa4c8b05f753cd9541014c391891c1f75':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
83419118e3c72311ef6b900457d1b03fd5c77883':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Filip Gruszczynski [Tue, 17 Mar 2015 18:35:17 +0000 (18:35 +0000)]
am
86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '
86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.
Also don't shift immediately after starting ambient mode, but wait until
the first update.
Bug:
19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:52 +0000 (14:44 +0000)]
am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:46 +0000 (14:44 +0000)]
am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:36:50 +0000 (14:36 +0000)]
am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
38467b5fbbc09ad05624454f735d27ada25565c8':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 02:04:33 +0000 (02:04 +0000)]
Merge "Change jit properties to be debug properties"
Andreas Gampe [Tue, 17 Mar 2015 00:25:04 +0000 (00:25 +0000)]
am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 00:12:24 +0000 (00:12 +0000)]
Merge "Frameworks/base: Fix a comparison"
Mathieu Chartier [Mon, 16 Mar 2015 23:10:52 +0000 (16:10 -0700)]
Change jit properties to be debug properties
Bug:
19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
Andreas Gampe [Mon, 16 Mar 2015 20:49:12 +0000 (20:49 +0000)]
am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
Andreas Gampe [Mon, 16 Mar 2015 20:36:04 +0000 (20:36 +0000)]
Merge "Frameworks/base: Force long computation"
Andreas Gampe [Mon, 16 Mar 2015 19:31:17 +0000 (19:31 +0000)]
am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
Andreas Gampe [Mon, 16 Mar 2015 19:22:00 +0000 (19:22 +0000)]
am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
Andreas Gampe [Mon, 16 Mar 2015 19:17:44 +0000 (19:17 +0000)]
Merge "Frameworks/base: Check before foreach in Script"
Andreas Gampe [Mon, 16 Mar 2015 19:10:39 +0000 (19:10 +0000)]
Merge "Frameworks/base: Use equals for Integer comparison"
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.
- Set project callback when LayoutInflater is created by
LayoutInflater.from(context).
- Remove duplication of code to get base context from context wrapper.
Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
Andreas Gampe [Mon, 16 Mar 2015 18:03:17 +0000 (18:03 +0000)]
am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
Andreas Gampe [Mon, 16 Mar 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Revert "Frameworks/base: Fix a constructor""
Andreas Gampe [Mon, 16 Mar 2015 17:51:01 +0000 (17:51 +0000)]
Revert "Frameworks/base: Fix a constructor"
The constructor was public API, doh. Gotta do this differently.
This reverts commit
33c5b2a62f3e62382c41e24c6b527119978816a0.
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
Andreas Gampe [Mon, 16 Mar 2015 17:12:57 +0000 (17:12 +0000)]
am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:03:02 +0000 (17:03 +0000)]
am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
d61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 16:59:13 +0000 (16:59 +0000)]
Merge "Frameworks/base: Fix null-pointer check"
Andreas Gampe [Mon, 16 Mar 2015 16:51:00 +0000 (16:51 +0000)]
Merge "Frameworks/base: Fix a constructor"
Robert Greenwalt [Mon, 16 Mar 2015 16:29:52 +0000 (16:29 +0000)]
am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
Robert Greenwalt [Mon, 16 Mar 2015 16:17:50 +0000 (16:17 +0000)]
Merge "Frameworks/base: Fix a hashCode implementation"
Filip Gruszczynski [Sat, 14 Mar 2015 00:39:31 +0000 (17:39 -0700)]
Option for going home when going to sleep for devices without physical button.
Bug:
19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
Andreas Gampe [Mon, 16 Mar 2015 15:43:37 +0000 (15:43 +0000)]
am
5abcd06b: Merge "Frameworks/base: Fix always-false equals"
* commit '
5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
Andreas Gampe [Mon, 16 Mar 2015 15:28:52 +0000 (15:28 +0000)]
Merge "Frameworks/base: Fix always-false equals"
John Reck [Mon, 16 Mar 2015 15:09:04 +0000 (15:09 +0000)]
am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 14:56:51 +0000 (14:56 +0000)]
Merge "Frameworks/base: Fix missing cast"
Geoff Mendal [Mon, 16 Mar 2015 13:14:52 +0000 (13:14 +0000)]
am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:14:47 +0000 (13:14 +0000)]
am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:29 +0000 (13:07 +0000)]
am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
74c66d10a7b2237f8aaf8c10675a10b9347860f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:26 +0000 (13:07 +0000)]
am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 12:57:17 +0000 (12:57 +0000)]
am
eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
eb1aec7fef3597fbbffe157a803e1dd54a9054b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:57:12 +0000 (12:57 +0000)]
am
9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
9a036229277479c0bc53d850ed5c98b8b69aa080':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:52:00 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:50:19 +0000 (12:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:39 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:25 +0000 (12:49 +0000)]
am
e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit '
e35b3e380f42f450ce0116b8ef83edb7d68584ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:48:31 +0000 (05:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:33 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:06 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:31:48 +0000 (05:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
Andreas Gampe [Mon, 16 Mar 2015 03:17:07 +0000 (20:17 -0700)]
Frameworks/base: Force long computation
Ensure that an int-based computation is carried out as long.
Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
Andreas Gampe [Mon, 16 Mar 2015 01:04:41 +0000 (18:04 -0700)]
Frameworks/base: Fix a comparison
Change-Id: I80d62869920e77110c95f20369ec2631c75f6ed4
Andreas Gampe [Sun, 15 Mar 2015 22:57:30 +0000 (15:57 -0700)]
Frameworks/base: Check before foreach in Script
According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.
Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
Andreas Gampe [Sun, 15 Mar 2015 22:39:21 +0000 (15:39 -0700)]
Frameworks/base: Use equals for Integer comparison
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.
Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.
Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
Andreas Gampe [Sun, 15 Mar 2015 22:07:19 +0000 (15:07 -0700)]
Frameworks/base: Fix null-pointer check
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
Andreas Gampe [Sun, 15 Mar 2015 21:38:59 +0000 (14:38 -0700)]
Frameworks/base: Fix a hashCode implementation
Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).
Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
OSDN Git Service
