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

201584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
e539a35b89 Import translations. DO NOT MERGE 
Change-Id: Icf921651b40f14e85ce741cf13f3fd0b2c1c184e
Auto-generated-cl: translation import
 2015-06-17 07:48:55 -05:00
Vladimir Marko
5f0a653c88 am 8f6a8fe6: am 86fc9f4e: am dc22cfed: Merge "Don\'t prevent notification updates in DOS protection." 
* commit '8f6a8fe65cf8605d29b29bad79436f8606942645':
  Don't prevent notification updates in DOS protection.
 2015-06-17 10:16:49 +00:00
Narayan Kamath
6aa7f64926 am 4c50df66: am 5131e025: am 4600dd05: ZipFileRO: Use precise widths for zip file types. 
* commit '4c50df66f9756017108be49fcd91be021d2baf30':
  ZipFileRO: Use precise widths for zip file types.
 2015-06-17 10:16:43 +00:00
Vladimir Marko
8f6a8fe65c am 86fc9f4e: am dc22cfed: Merge "Don\'t prevent notification updates in DOS protection." 
* commit '86fc9f4efae682a2b17712d64606c8312514e56b':
  Don't prevent notification updates in DOS protection.
 2015-06-17 10:05:53 +00:00
Narayan Kamath
4c50df66f9 am 5131e025: am 4600dd05: ZipFileRO: Use precise widths for zip file types. 
* commit '5131e0255d676c2ead28dbfb7957d753da21e9ab':
  ZipFileRO: Use precise widths for zip file types.
 2015-06-17 10:04:50 +00:00
Narayan Kamath
5131e0255d am 4600dd05: ZipFileRO: Use precise widths for zip file types. 
* commit '4600dd053dbdbd4b95f3b11057a1cc55b99f9c77':
  ZipFileRO: Use precise widths for zip file types.
 2015-06-17 09:51:23 +00:00
Vladimir Marko
86fc9f4efa am dc22cfed: Merge "Don\'t prevent notification updates in DOS protection." 
* commit 'dc22cfed5d3a65dcd3979113dbce468ad8ec2868':
  Don't prevent notification updates in DOS protection.
 2015-06-17 09:48:58 +00:00
Vladimir Marko
dc22cfed5d Merge "Don't prevent notification updates in DOS protection." 2015-06-17 09:04:35 +00:00
Narayan Kamath
4600dd053d ZipFileRO: Use precise widths for zip file types. 
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
 2015-06-17 08:40:25 +00:00
Ruben Brunk
ac69b9b294 am 51219951: am de2896a5: am 5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev 
* commit '51219951a8e72c199fd15aad1614fc046d2a03a4':
  Move distortion correction to correct opcode list.
 2015-06-17 07:12:33 +00:00
Yohei Yukawa
75da8fa8c7 am 97261d79: am 6df39517: am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
* commit '97261d797933f59174ea74e73eb3575679592a7e':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
 2015-06-17 07:12:25 +00:00
Jeff Sharkey
23764ced9a am bc8341f4: (-s ours) am d3e5453f: am 3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev 
* commit 'bc8341f4e5a4fb6689be7784c700534cf6ec5b8b':
  Finish when browsed root goes away.
 2015-06-17 07:12:18 +00:00
Ruben Brunk
51219951a8 am de2896a5: am 5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev 
* commit 'de2896a5da011313ed89a873b92bca0c2529a875':
  Move distortion correction to correct opcode list.
 2015-06-17 06:45:38 +00:00
Ruben Brunk
de2896a5da am 5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev 
* commit '5e063b1da52cca1b93b19bdf7be694aabf95d336':
  Move distortion correction to correct opcode list.
 2015-06-17 06:33:01 +00:00
Ruben Brunk
5e063b1da5 Merge "Move distortion correction to correct opcode list." into mnc-dev 2015-06-17 06:22:24 +00:00
Ruben Brunk
fe81662cc5 Move distortion correction to correct opcode list. 
- Prior to this, the lens distortion correction was applying
  resampling to the bayer mosaic, resulting in magenta
  output images (oops).

Bug: 20491394
Change-Id: Ia244364954062d1c38ef3ec3b7a1d087904112f9
 2015-06-16 23:08:26 -07:00
Yohei Yukawa
97261d7979 am 6df39517: am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
* commit '6df395171de030be8aeca1f89c5b1641133fa2bb':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
 2015-06-17 04:43:10 +00:00
Yohei Yukawa
6df395171d am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
* commit 'f4d225a4b502ef227788447eb1a5bb2902019c01':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
 2015-06-17 04:30:16 +00:00
Yohei Yukawa
f4d225a4b5 Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
This is a follow up CL for Ifd05565ac0c057c46ec88a3fb9094c04934041d.

SpellCheckerSessionListenerImpl.taskToString(TASK_CANCEL) has
somehow returned "STATE_WAIT_CONNECTION" probably because of
a copy-and-paste mistake.

With this CL, it now returns "TASK_CANCEL", which is observable
only in debug log anyway though.

Bug: 21319642
Change-Id: Ib0bf11494bd3f210e6e8192fc25a33c65f7d313d
 2015-06-16 21:19:00 -07:00
Jeff Sharkey
bc8341f4e5 am d3e5453f: am 3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev 
* commit 'd3e5453f2e5e7a58ada5b8524413d88b3f23d04d':
  Finish when browsed root goes away.
 2015-06-17 04:18:34 +00:00
Jeff Sharkey
d3e5453f2e am 3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev 
* commit '3d00f7a1be6ff858a89e2220f33231ecb3570ef3':
  Finish when browsed root goes away.
 2015-06-17 04:08:17 +00:00
Jeff Sharkey
3d00f7a1be Merge "Finish when browsed root goes away." into mnc-dev 2015-06-17 03:55:36 +00:00
Jeff Sharkey
8bb1245a48 Finish when browsed root goes away. 
If we're browsing a specific root, and that root went away, typically
due to formatting.

Bug: 21831184
Change-Id: Ie07607a81e32a7d82c88ad382658a471d47b905d
 2015-06-16 20:54:14 -07:00
Yohei Yukawa
a983163979 am 54090fef: am cfcd232e: am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 
* commit '54090fef7815ca4c2e969f759f96d7c3cdb231b9':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
 2015-06-17 03:26:35 +00:00
Yohei Yukawa
54090fef78 am cfcd232e: am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 
* commit 'cfcd232e453cbb9a0ce2ac1f61250680afdb1b52':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
 2015-06-17 03:13:23 +00:00
Yohei Yukawa
cfcd232e45 am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 
* commit 'e34f0984bb879cb7c89b8ff5a78e4bc7243c6331':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
 2015-06-17 03:02:32 +00:00
Yohei Yukawa
e34f0984bb Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 2015-06-17 02:54:08 +00:00
Jim Miller
226d85529f am fef390e8: am c527dfff: am 42376d64: Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev 
* commit 'fef390e883efc7f2b9b0bb9083e9cb5a6d9c1183':
  Clarification in i10n description for adding a dot to the pattern
 2015-06-17 01:17:10 +00:00
Jim Miller
fef390e883 am c527dfff: am 42376d64: Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev 
* commit 'c527dfff713a657b03857b2f360b045e2d834372':
  Clarification in i10n description for adding a dot to the pattern
 2015-06-17 01:04:38 +00:00
Joe Fernandez
18ebd3a039 am b93bdb27: am 86b504c6: am b93205a0: am 31217aa5: am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit 'b93bdb27b4043e52f30fa7e676ce3e4064cc3408':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:53:07 +00:00
Jim Miller
c527dfff71 am 42376d64: Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev 
* commit '42376d6482804ac240fc84a75e50e7fae478b744':
  Clarification in i10n description for adding a dot to the pattern
 2015-06-17 00:52:52 +00:00
Jim Miller
42376d6482 Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev 2015-06-17 00:40:59 +00:00
Joe Fernandez
b93bdb27b4 am 86b504c6: am b93205a0: am 31217aa5: am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit '86b504c601d96f2cddb327e3b836f834b668f097':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:39:28 +00:00
Jim Miller
231eb59566 Clarification in i10n description for adding a dot to the pattern 
Fixes bug 21865115

Change-Id: I093336d3e70dba5143af153aa3cb727ce33471a4
 2015-06-16 17:39:04 -07:00
Pierre Vandwalle
a95806c834 am 9364175b: am 48e63d60: am ced1a659: add creation/update time to WifiConfiguration 
* commit '9364175b151583522034a6713ebfcfaa9381253b':
  add creation/update time to WifiConfiguration
 2015-06-17 00:34:02 +00:00
Joe Fernandez
86b504c601 am b93205a0: am 31217aa5: am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit 'b93205a0df921521828ce1ea1798c57585fa1226':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:28:01 +00:00
Pierre Vandwalle
9364175b15 am 48e63d60: am ced1a659: add creation/update time to WifiConfiguration 
* commit '48e63d60916354cdc71ddbd8df0b01cc054d2b00':
  add creation/update time to WifiConfiguration
 2015-06-17 00:20:39 +00:00
Joe Fernandez
b93205a0df am 31217aa5: am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit '31217aa591e4f0acc5937d51a2455c36b44da7e2':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:15:42 +00:00
Pierre Vandwalle
48e63d6091 am ced1a659: add creation/update time to WifiConfiguration 
* commit 'ced1a6599042826a3bf678871d6b8a9e7187e973':
  add creation/update time to WifiConfiguration
 2015-06-17 00:09:56 +00:00
Joe Fernandez
31217aa591 am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit 'e343e673eca0c0e3b943ce7ddd27b37e29a873f4':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:01:57 +00:00
Pierre Vandwalle
ced1a65990 add creation/update time to WifiConfiguration 
Change-Id: Iaace83e752c8aa7d740a3dfad42cd8bba80a7a08
 2015-06-16 16:56:29 -07:00
Joe Fernandez
e343e673ec Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 2015-06-16 23:54:34 +00:00
Junda Liu
ca0ff76539 am 603bf00f: am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit '603bf00fcba0e95ed42cd4b9eadd1bfc1b45b28a':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:45:09 +00:00
Junda Liu
603bf00fcb am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit '25acdffa23be41c4e49021153983d67e9fa48e38':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:32:58 +00:00
Maxim Bogatov
918c3fc326 am 8cd453d1: am a09ee4a6: am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 
* commit '8cd453d11d26cb362dddc41667b9f324c0b6873a':
  fix CTS: AccessibilityEndToEndTest failing
 2015-06-16 23:29:50 +00:00
Junda Liu
25acdffa23 am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:18:50 +00:00
Maxim Bogatov
8cd453d11d am a09ee4a6: am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 
* commit 'a09ee4a6a60080611ef31f16ecb9195da9ae3709':
  fix CTS: AccessibilityEndToEndTest failing
 2015-06-16 23:14:01 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Matthew Williams
e7ed27bf54 am 5df4154b: am 53e8781d: am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev 
* commit '5df4154b1ba7d051949eceb3413b6a92e068361b':
  Make sync settings restore more robust
 2015-06-16 23:07:48 +00:00
Alan Viverette
e96dd1ffdd am d1d1607b: am b0bed09a: am 469b5da8: Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev 
* commit 'd1d1607bd197d1afdf07a5a30462de8662c22b7e':
  Ensure first load for bitmap and nine-patch gets correct density
 2015-06-16 23:07:43 +00:00