drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,611 Commits 1 Branch 0 Tags
Commit Graph

175611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
63662320ae Frameworks/base: Force long computation 
Ensure that an int-based computation is carried out as long.

Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
 2015-03-15 20:17:07 -07:00
Andreas Gampe
650989b0b5 Frameworks/base: Fix a comparison 
Change-Id: I80d62869920e77110c95f20369ec2631c75f6ed4
 2015-03-15 18:04:41 -07:00
Andreas Gampe
c8ddcddd13 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
 2015-03-15 15:57:30 -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
Shawn Willden
fe2b1a8298 Add KM_TAG_AUTH_TOKEN. 
Change-Id: Id9a22ad32137f3e0380c2812f790bbecab511d11
 2015-03-14 10:51:56 -06:00
Shawn Willden
7714a9413f Add support for KM_TAG_USER_SECURE_ID. 
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
 2015-03-14 10:50:32 -06:00
Bryce Lee
8326554788 Add Assist global action for wear to different from VOICE_ASSIST 
Bug: 19722315
Change-Id: I0b1e5625a2eaabfe0015a4d730b25e84d60a3714
 2015-03-14 07:57:48 -07:00
Michael Wright
561d104367 Prevent activities from being started during setup wizard. 
Bug: 19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
 2015-03-13 19:51:28 -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
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering. 
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
 2015-03-13 14:28:14 -07:00
Andrew Solovay
a83fd76089 docs: Fixed typo (spurious quotation mark). 
See first comment for stage location.

bug: 18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1
 2015-03-13 13:52:04 -07:00
Dmitriy Ivanov
ca4f2e838c Switch libjnigraphics to sysv-only hash style 
Bug: 19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
 2015-03-13 12:49:47 -07:00
Andrew Solovay
a8b5b2512f docs: Fixed broken image link, and broke long lines in code samples 
While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.

See first comment for doc stage location.

bug: 19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2
 2015-03-13 12:46:37 -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
Luan Nguyen
a8bdd2f341 am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:49:46 +00:00
Chad Brubaker
f1654c6015 Merge "Add initial Keymaster 1.0 tests" 2015-03-13 17:48:09 +00:00
Luan Nguyen
42bb44dbf5 Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 2015-03-13 17:42:15 +00:00
Luan Nguyen
534b83dc4b cherrypick from lmp-docs docs: Update auto landing and design page image 
assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

Change-Id: I05d519595997683e88aaaa84ec76b353c3985aa7
 2015-03-13 09:19:43 -07:00
Craig Mautner
e8ef4af3df am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '5be1afedd8f2289ba047473b242cd0535a4493fe':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:53:51 +00:00
Craig Mautner
5be1afedd8 am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:46:51 +00:00
Craig Mautner
7151b1ef42 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:37:32 +00:00
Craig Mautner
98560bdf87 am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:29:21 +00:00
Craig Mautner
bfcc60a3f0 am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:22:33 +00:00