Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,365 Commits 3 Branches 0 Tags
c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0
Commit Graph

175365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
c3228a9d40 am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit '3d33314e03c24758e3b3bbd9e23e40199a259b80':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 19:22:00 +00:00
Andreas Gampe
3d33314e03 Merge "Frameworks/base: Use equals for Integer comparison" 2015-03-16 19:10:40 +00:00
Andreas Gampe
8af305f17f am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:03:17 +00:00
Andreas Gampe
6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor"" 2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb Revert "Frameworks/base: Fix a constructor" 
The constructor was public API, doh. Gotta do this differently.

This reverts commit 33c5b2a62f.

Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
 2015-03-16 17:51:01 +00:00
Andreas Gampe
8e176d396d am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
  Frameworks/base: Fix null-pointer check
 2015-03-16 17:12:57 +00:00
Andreas Gampe
19279ec048 am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
  Frameworks/base: Fix a constructor
 2015-03-16 17:03:02 +00:00
Andreas Gampe
007e207bde Merge "Frameworks/base: Fix null-pointer check" 2015-03-16 16:59:14 +00:00
Andreas Gampe
d61cbf9a08 Merge "Frameworks/base: Fix a constructor" 2015-03-16 16:51:01 +00:00
Robert Greenwalt
7cff91ea67 am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:29:52 +00:00
Robert Greenwalt
079cfa64ec Merge "Frameworks/base: Fix a hashCode implementation" 2015-03-16 16:17:51 +00:00
Andreas Gampe
038b846284 am 5abcd06b: Merge "Frameworks/base: Fix always-false equals" 
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
  Frameworks/base: Fix always-false equals
 2015-03-16 15:43:37 +00:00
Andreas Gampe
5abcd06b1f Merge "Frameworks/base: Fix always-false equals" 2015-03-16 15:28:53 +00:00
John Reck
059ba9814b am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast
 2015-03-16 15:09:04 +00:00
John Reck
386dcbddf5 Merge "Frameworks/base: Fix missing cast" 2015-03-16 14:56:52 +00:00
Geoff Mendal
c64f5ca02b 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
 2015-03-16 13:14:52 +00:00
Geoff Mendal
4777b612e0 am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '3437d9e716e477d407dfc13cc797500e6421e464':
  Import translations. DO NOT MERGE
 2015-03-16 13:14:47 +00:00
Geoff Mendal
0134869b5c am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:29 +00:00
Geoff Mendal
3437d9e716 am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:26 +00:00
Geoff Mendal
74c66d10a7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-16 13:05:43 +00:00
Geoff Mendal
3fb3408b2e am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'eb1aec7fef3597fbbffe157a803e1dd54a9054b5':
  Import translations. DO NOT MERGE
 2015-03-16 12:57:17 +00:00
Geoff Mendal
e0c0f6c2a8 am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '9a036229277479c0bc53d850ed5c98b8b69aa080':
  Import translations. DO NOT MERGE
 2015-03-16 12:57:12 +00:00
Geoff Mendal
de4be3bc2c Import translations. DO NOT MERGE 
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
 2015-03-16 05:52:00 -07:00
Geoff Mendal
eb1aec7fef Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-16 12:50:20 +00:00
Geoff Mendal
9a03622927 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-16 12:49:40 +00:00
Geoff Mendal
51448a1a60 am e35b3e38: (-s ours) Import translations. DO NOT MERGE 
* commit 'e35b3e380f42f450ce0116b8ef83edb7d68584ef':
  Import translations. DO NOT MERGE
 2015-03-16 12:49:25 +00:00
Geoff Mendal
57d39a3d70 Import translations. DO NOT MERGE 
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
 2015-03-16 05:48:31 -07:00
Geoff Mendal
f3e18606f7 Import translations. DO NOT MERGE 
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
 2015-03-16 05:35:33 -07:00
Geoff Mendal
c6c9079a61 Import translations. DO NOT MERGE 
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
 2015-03-16 07:35:06 -05:00
Geoff Mendal
e35b3e380f Import translations. DO NOT MERGE 
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
 2015-03-16 05:31:48 -07:00
Andreas Gampe
5c5978985a 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
 2015-03-15 15:45:15 -07:00
Andreas Gampe
f2b1cff4e2 Frameworks/base: Fix null-pointer check 
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
 2015-03-15 15:07:19 -07:00
Andreas Gampe
34a7d13a65 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
 2015-03-15 14:38:59 -07:00
Andreas Gampe
33c5b2a62f Frameworks/base: Fix a constructor 
This was meant to be a constructor, according to the comment.

Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
 2015-03-15 14:29:16 -07:00
Andreas Gampe
007cfa73b8 Frameworks/base: Fix always-false equals 
Rect != Insets.

Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
 2015-03-15 14:19:43 -07:00
Andreas Gampe
65ac8a2bd7 Frameworks/base: Fix missing cast 
Without a cast, the division is integer division.

Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
 2015-03-15 14:10:23 -07:00
Dmitriy Ivanov
1c8b3778e1 am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style" 
* commit '9aeb080eec2286e8604901bd2b8248be4e527107':
  Switch libjnigraphics to sysv-only hash style
 2015-03-13 21:50:47 +00:00
Dmitriy Ivanov
9aeb080eec Merge "Switch libjnigraphics to sysv-only hash style" 2015-03-13 21:35:04 +00:00
Dmitriy Ivanov
ca4f2e838c Switch libjnigraphics to sysv-only hash style 
Bug: 19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
 2015-03-13 12:49:47 -07:00
Luan Nguyen
83b96e02a4 am d9eb3881: am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit 'd9eb3881f452ecb4b77062eb6505a3d7601d0a8c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:50:45 +00:00
Luan Nguyen
d9eb3881f4 am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '0c89bdb7a7eb491c503c369c0f1d9e523c8ae34a':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:42:03 +00:00
Jeff Tinker
0d22633e07 am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 
* commit '62632e25f57989d5e5ac406e21f037a3e2f39b9c':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
 2015-03-13 18:35:32 +00:00
Luan Nguyen
0c89bdb7a7 am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '0d756f7d5646f84753a3db5f702f4ac79bda22bf':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:28:45 +00:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Nick Kralevich
870110e01a am 30fcd2aa: Merge "Drop unusable SELinux APIs." 
* commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
  Drop unusable SELinux APIs.
 2015-03-13 18:16:58 +00:00
Chad Brubaker
99e9acd940 am f1654c60: Merge "Add initial Keymaster 1.0 tests" 
* commit 'f1654c6015dbf30b7dae3575d787ca141ae84028':
  Add initial Keymaster 1.0 tests
 2015-03-13 18:16:52 +00:00
Luan Nguyen
0d756f7d56 am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '217a435665880076abb71085e9d76aec4ff83b6d':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:13:39 +00:00
Nick Kralevich
30fcd2aa8a Merge "Drop unusable SELinux APIs." 2015-03-13 18:02:47 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs. 
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-03-13 14:09:26 -04:00
Luan Nguyen
217a435665 am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit 'a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:57:02 +00:00