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

195262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
977fdc8e1c Import translations. DO NOT MERGE 
Change-Id: If7f177f95be4ab365cf62a8dc080373a7ae0e27b
Auto-generated-cl: translation import
 2015-06-17 08:58:03 -05:00
Narayan Kamath
2c89e7d8db Merge "Delete android.speech.srec.*" into mnc-dev 2015-06-17 11:38:16 +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
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
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
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
e34f0984bb Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 2015-06-17 02:54:08 +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
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
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
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
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
Alan Viverette
469b5da883 Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev 2015-06-16 22:33:25 +00:00
Jeff Sharkey
fd0475702b Merge "Dismiss migration notification when wizard done." into mnc-dev 2015-06-16 22:31:31 +00:00
Maxim Bogatov
f399af3e5f fix CTS: AccessibilityEndToEndTest failing 
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
 2015-06-16 15:19:42 -07:00
Quddus Chong
2ce8daacac am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '83ee59d5de365669cd7a9d8bfa552a90678d0587':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:15:15 +00:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Quddus Chong
83ee59d5de am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:05:54 +00:00
Alan Viverette
63a39ffe48 Ensure first load for bitmap and nine-patch gets correct density 
Remove unnecessary lines setting target density on bitmap and nine patch,
since we'll do this later in inflate().

Bug: 21774853
Change-Id: I5ea316bee81f82192ce20f2f1bee0e62c6ec8ccb
 2015-06-16 15:04:45 -07:00
Quddus Chong
375ad9e1eb docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. 
bug: 21400628

Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
 2015-06-16 14:54:29 -07:00
dcashman
2f90295924 Merge "Make keysetmgrservice gurantees explicit." into mnc-dev 2015-06-16 21:52:58 +00:00
Matthew Williams
53abfdb86c Make sync settings restore more robust 
Bug: 18506992
Parent Bug: 17967106
Introduce a new state for ContentResolver#getIsSyncable.
This state specifies that an adapter should be disabled until
explicitly turned on by ContentResolver#setSyncAutomatically(true).
In this way we can restore disabled sync adapters and still allow
them to run their initialization logic later on when they are
re-enabled.

Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
 2015-06-16 14:46:59 -07:00
Jinsuk Kim
52ca020722 Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev 2015-06-16 21:45:01 +00:00
Terry Heo
795415b57b CEC: Handle <Set Menu Language> message on playback devices 
Bug: 16819131, Bug: 21505123
Change-Id: I3dc6439c13c2ebe5591d9e27c0c86419ed440f9b
 2015-06-17 06:41:26 +09:00
Paul McLean
8ff232c7be Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev 2015-06-16 21:41:23 +00:00
Paul McLean
f29e5f34b3 Implement channel index masks in AudioDeviceInfo. 
Bug: 21146646
Change-Id: I210f6bb4a4ec0ac0820d1823cffe417141725327
 2015-06-16 14:40:28 -07:00
Andrew Solovay
b259a9036b am c75034f1: am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 
* commit 'c75034f1e40719aeec3e703d51414ac05fe2ca98':
  docs: Added new "100 days" video to AfW landing page
 2015-06-16 21:37:23 +00:00
Jeff Sharkey
df27d3bf30 Dismiss migration notification when wizard done. 
Bug: 21830731
Change-Id: Ief1428cd1ee0885fbc026885e1907f7272810d0f
 2015-06-16 14:35:50 -07:00
Dianne Hackborn
f4c936a7e6 Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev 2015-06-16 21:34:27 +00:00
Adam Powell
8edfe18c19 Merge "Fully remove Toolbar children when action views expand" into mnc-dev 2015-06-16 21:30:13 +00:00
Adam Powell
26b27cab81 Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 2015-06-16 21:29:48 +00:00
Ruben Brunk
1c52669d1f Merge "Add distortion correction opcodes in DngCreator." into mnc-dev 2015-06-16 20:50:30 +00:00
Alex Klyubin
e826515469 Merge "Harden KeyInfo." into mnc-dev 2015-06-16 20:37:59 +00:00
Eino-Ville Talvala
57af75313c Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 2015-06-16 20:37:35 +00:00
Alex Klyubin
ffdfb57931 Harden KeyInfo. 
This ensures that KeyInfo instances are truly immutable.

Bug: 18088752
Change-Id: Ic157d3b928b129a02c3cab9dd20ba9936a005813
 2015-06-16 13:13:13 -07:00
Alex Klyubin
ee0a0c6ff4 Merge "Harden and clean up KeyProtection." into mnc-dev 2015-06-16 19:54:24 +00:00
Alex Klyubin
cb3bb3f03a Harden and clean up KeyProtection. 
This ensures that instances of this class are immutable and cleans up
some flawed logic discovered when writing up CTS tests.

Bug: 18088752
Change-Id: If9cc33192ada5a8982a2b200ab24cb18331cf958
 2015-06-16 12:31:34 -07:00
Alex Klyubin
4f13166707 Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev 2015-06-16 19:11:59 +00:00
Alex Klyubin
1b937eebdd Harden and clean up KeyGenParameterSpec. 
This ensures that instances of this class are immutable and cleans up
some flawed logic discovered when writing up CTS tests.

Bug: 18088752
Change-Id: I7a27dbfc3445599bccabbd26e39535ce988a2ab2
 2015-06-16 12:11:10 -07:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system. 
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
 2015-06-16 11:45:33 -07:00
Narayan Kamath
b39dfe87b8 Delete android.speech.srec.* 
This code had an undeclared dependency on libsrec_jni which
we no longer build.

bug: 21855957
Change-Id: Ie00645960b18aaa2a7d944a2ad31ff57e0b0b2ba
 2015-06-16 19:40:09 +01:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Andrew Solovay
c75034f1e4 am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 
* commit 'c7965b024d660b62e5500e4bb8a3f942960dddf1':
  docs: Added new "100 days" video to AfW landing page
 2015-06-16 17:57:03 +00:00
Chris Wren
3397727b16 Merge "disable verbose logs from people notifications." into mnc-dev 2015-06-16 17:54:12 +00:00