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

185089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
a41378ac27 am c64f5ca0: (-s ours) am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c64f5ca02b16ebece40c21f401f75c7ace8178ac':
  Import translations. DO NOT MERGE
 2015-03-16 13:22:28 +00:00
Geoff Mendal
19f65359b9 am 4777b612: (-s ours) am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '4777b612e07f57afbcf362b78b0b6e1e5e77e8bb':
  Import translations. DO NOT MERGE
 2015-03-16 13:22:20 +00:00
Geoff Mendal
ef096473c8 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:20:50 +00:00
Geoff Mendal
8e39914610 Import translations. DO NOT MERGE 
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
 2015-03-16 06:19:39 -07: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
844c6a5194 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:10:09 +00:00
Geoff Mendal
c890637d82 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:08:43 +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
c84863bc2e am 3fb3408b: (-s ours) am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
  Import translations. DO NOT MERGE
 2015-03-16 13:04:07 +00:00
Geoff Mendal
cb5ebc25fe am e0c0f6c2: (-s ours) am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7':
  Import translations. DO NOT MERGE
 2015-03-16 13:03:56 +00:00
Geoff Mendal
0ef51ec3dd Import translations. DO NOT MERGE 
Change-Id: Ic3f3b8418d69d37a26c0be77047faf3ea9294b0f
Auto-generated-cl: translation import
 2015-03-16 06:03:55 -07:00
Geoff Mendal
0c5d398e9f Import translations. DO NOT MERGE 
Change-Id: I5059160456eb65bedb552f97b6ed500ef540839f
Auto-generated-cl: translation import
 2015-03-16 05:57:47 -07: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
1dc1220679 am 51448a1a: (-s ours) am e35b3e38: (-s ours) Import translations. DO NOT MERGE 
* commit '51448a1a604ca7e4c8cedeb31d2907bcca524f6e':
  Import translations. DO NOT MERGE
 2015-03-16 12:56:32 +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
Nicolas Prevot
8458e531bf Merge "Remove the owner userid of cross-profile intent filters." 2015-03-16 11:25:51 +00: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
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
Vinit Deshpande
4cd92835be Fixing build after merge from mirror-m-wireless-internal-release 
There have been few breaking changes

1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out

Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
 2015-03-15 14:04:19 -07:00
Vinit Deshpande
ea76e49e6f am "am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge: c984826" 
merged from goog/mirror-m-wireless-internal-release
1ef2b92 am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge: c984826
 2015-03-15 13:44:36 -07:00
Vinit Deshpande
861ea44a62 am "am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list." 
merged from goog/mirror-m-wireless-internal-release
c984826 am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-15 13:44:35 -07:00
Vinit Deshpande
7b41c627a0 am "am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge: 713e7cc" 
merged from goog/mirror-m-wireless-internal-release
fbabcb0 am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge: 713e7cc
 2015-03-15 13:44:34 -07:00
Vinit Deshpande
468d549185 am "am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge: 3a5a410" 
merged from goog/mirror-m-wireless-internal-release
d5e957c am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge: 3a5a410
 2015-03-15 13:44:33 -07:00
Vinit Deshpande
66fd358cc8 am "am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
713e7cc am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
 2015-03-15 13:44:32 -07:00
Vinit Deshpande
b721fdec2f am "am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge: 5c69ca2" 
merged from goog/mirror-m-wireless-internal-release
2561d87 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge: 5c69ca2
 2015-03-15 13:44:31 -07:00
Vinit Deshpande
66ef27eb46 am "am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36" 
merged from goog/mirror-m-wireless-internal-release
ad04942 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36
 2015-03-15 13:44:30 -07:00
Vinit Deshpande
48db44822c am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev automerge: 4abf088" 
merged from goog/mirror-m-wireless-internal-release
746db9c am 71518174: Merge "Fix project settings." into lmp-mr1-dev automerge: 4abf088
 2015-03-15 13:44:29 -07:00
Vinit Deshpande
5f567df4d2 am "am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge: 26f672a" 
merged from goog/mirror-m-wireless-internal-release
4f221f0 am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge: 26f672a
 2015-03-15 13:44:28 -07:00
Vinit Deshpande
54fa5c0d5b am "am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
3a5a410 am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
 2015-03-15 13:44:26 -07:00
Vinit Deshpande
8819022c82 am "am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev" 
merged from goog/mirror-m-wireless-internal-release
5c69ca2 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
 2015-03-15 13:44:25 -07:00
Vinit Deshpande
d5b81ce280 am "am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge: 766889e" 
merged from goog/mirror-m-wireless-internal-release
3be3344 am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge: 766889e
 2015-03-15 13:44:24 -07:00
Vinit Deshpande
0acf1ffe68 am "am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
49d3c36 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
 2015-03-15 13:44:23 -07:00
Vinit Deshpande
7a5dcd62e7 am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
4abf088 am 71518174: Merge "Fix project settings." into lmp-mr1-dev
 2015-03-15 13:44:22 -07:00