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

179598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master 
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
 2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
automerge: 8109599b

* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
  docs: studio workflow links
 2015-01-06 19:36:41 +00:00
Paul Miller
f6bf1d7b30 Fix crash on pasting text in a WebView 
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
 2015-01-06 11:32:02 -08:00
Nick Kralevich
0e55e3565e resolved conflicts for merge of 1779fd15 to master 
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
 2015-01-06 11:29:44 -08:00
Christopher Tate
ad02e38b63 am 0a511d33: am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '0a511d33b0a7887baab95c39fd5889efad1962b1':
  Remove the "backup_data_changed" event log
 2015-01-06 19:19:07 +00:00
Dianne Hackborn
3d44382aca am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '6f36bd3a00a4708c425874764b63f0240e799cfd':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 19:19:00 +00:00
Alan Viverette
f4c068b72e Add getDither, getFilterBitmap to Drawable for CTS testing 
Also removes unnecessary overrides from PictureDrawable.

Change-Id: I13539b5204e8c0d8b9912da14de7ceae62720e3f
 2015-01-06 11:01:36 -08:00
Alan Viverette
304ea5aac7 Merge "Allow use of theme attributes in color state lists" 2015-01-06 18:47:29 +00:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes 
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
 2015-01-06 18:46:15 +00:00
Vladimir Marko
7ab249a18e Check for OOM in BitmapFactory's getMimeTypeString(). 
Bug: 18909596
Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
 2015-01-06 18:40:08 +00:00
Quddus Chong
96f11258ab am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit 'dc649c8da46dc1cc2ac7df41ddde0f28c64db687':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-06 18:23:08 +00:00
Quddus Chong
decac43191 am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '14694d6e6d8852bbf0591787e0f84627921996c9':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-06 18:23:04 +00:00
Quddus Chong
4d39cfa415 am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'a63d2b838396be0d9da7c8d8263f207beaf8d6f7':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-06 18:23:00 +00:00
Christopher Tate
0a511d33b0 am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '1c6014e77dfad1a7af229d642df7b7300beee721':
  Remove the "backup_data_changed" event log
 2015-01-06 18:16:43 +00:00
Quddus Chong
dc649c8da4 am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '8a195822e264754f08f43322348ebce273f72c40':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-06 18:15:54 +00:00
Quddus Chong
14694d6e6d am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '3bdc68edcf98a1ccdfea9539fe5e3a4d4416f8a8':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-06 18:15:51 +00:00
Quddus Chong
a63d2b8383 am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'b55e2bf0e0ab3150f99a6c50af56e99cc660e094':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-06 18:15:47 +00:00
Quddus Chong
8a195822e2 Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 2015-01-06 18:10:38 +00:00
Quddus Chong
3bdc68edcf Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 2015-01-06 18:10:17 +00:00
Quddus Chong
b55e2bf0e0 Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 2015-01-06 18:09:45 +00:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
6f36bd3a00 am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '5fe8197fde93f659acbbbdd5dda9c7eac69c468f':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 18:07:26 +00:00
Joe Fernandez
ca14e6c832 am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit 'f50be1fcce8df7c8ddb3553d3bc36007a0745af7':
  docs: studio index typo
 2015-01-06 18:03:58 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Joe Fernandez
c6fe54ed86 am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit '62c3abe73086301e7125d6dc88954e16e436bd9d':
  docs: studio bundle checksum update
 2015-01-06 17:57:35 +00:00
Joe Fernandez
f50be1fcce am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit '91c35ce153aa89f76ce60c6a77e21a4abc7614b5':
  docs: studio index typo
 2015-01-06 17:56:31 +00:00
Joe Fernandez
62c3abe730 am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'acb35e19d12d775bee761bef25c6d1581f015c11':
  docs: studio bundle checksum update
 2015-01-06 17:51:19 +00:00
Joe Fernandez
91c35ce153 Merge "docs: studio index typo" into lmp-docs 2015-01-06 17:50:58 +00:00
Joe Fernandez
acb35e19d1 Merge "docs: studio bundle checksum update" into lmp-docs 2015-01-06 17:46:04 +00:00
Olawale Ogunwale
59820738fd am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit 'd8aa4660b02b8a4a51e3ddbd347c306c41339576':
  Do not allow the navigation bar to move if width == height
 2015-01-06 16:56:46 +00:00
Olawale Ogunwale
d8aa4660b0 am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit 'da90a9c2355841bb98c2a669446b93ffe487a829':
  Do not allow the navigation bar to move if width == height
 2015-01-06 16:50:56 +00:00
Olawale Ogunwale
da90a9c235 Merge "Do not allow the navigation bar to move if width == height" 2015-01-06 16:43:56 +00:00
Paul Jensen
932bfab9aa am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '6c93739f2f25c8afb77997165fa86be537df67a9':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 14:57:44 +00:00
Paul Jensen
6c93739f2f am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '9ffb53cb1131eeac5c246e7378455bb4b64293f5':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 14:49:09 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests. 
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
 2015-01-06 09:43:04 -05:00
Narayan Kamath
031acc4b39 am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 10:16:34 +00:00
Narayan Kamath
721d0994dc am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 10:16:23 +00:00
Narayan Kamath
3787decd8d am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '5137415e391d8491d92535b17445ab646a3fcb5d':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 10:10:09 +00:00
Narayan Kamath
f60b2d40b0 am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit '024191b57f2165e4d0c2c579f95046d491feacb5':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 10:09:59 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod. 
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.

This is incorrect for pointer arguments where NULL should be
used instead.

Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>

Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
 2015-01-06 09:57:13 +00:00
Narayan Kamath
024191b57f Merge "Fix comment. It should be 'or' not 'of'." 2015-01-06 09:46:17 +00:00
Joe Fernandez
ea0137ef54 am 37425662: am 26994aa7: Merge "docs: Checklist for TV Apps" into lmp-docs 
* commit '37425662d3b2a17a8d2cb495d650f1e115dccabe':
  docs: Checklist for TV Apps
 2015-01-06 04:57:25 +00:00
Joe Fernandez
37425662d3 am 26994aa7: Merge "docs: Checklist for TV Apps" into lmp-docs 
* commit '26994aa7d41038127a6df6557e74fc833e540bcb':
  docs: Checklist for TV Apps
 2015-01-06 04:42:17 +00:00
Joe Fernandez
26994aa7d4 Merge "docs: Checklist for TV Apps" into lmp-docs 2015-01-06 04:35:33 +00:00
Jinsuk Kim
30a061ed4f am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'e96f9dd1a43e401ae3a73ac2b32bac6b6da2fe23':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:12:50 +00:00
Jinsuk Kim
e96f9dd1a4 am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'b0b4921bcbb0619587509b882d33da52ebb98106':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:06:35 +00:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device 
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
 2015-01-06 11:52:14 +09:00
Ricardo Cervera
2b2ad7ce9f am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
automerge: 0281909

* commit '02819090ece2ed8ff4161a560fcb5acb8c0b9cb5':
  docs: Update wearable lists docs
 2015-01-06 02:39:22 +00:00