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

64354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
09588f64a2 Fix BasicNfcEeTest java package. 
It was in com.android.nfc_extras, which caused it to get bundled with
com.android.nfc_extras.jar, which caused all kinds of confusion when
trying to push new versions of the test.

It should be in com.android.nfc_extras.tests

Also fix getContext() -> getTargetContext().

Change-Id: I1e3afa150809a3ed8c4f88531f039fe7797aca1d
 2011-12-09 14:35:32 -08:00
Gilles Debunne
6978639980 am 683a485f: am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit '683a485fbcf72caad42f9fd030255f1083ce5637':
  IOOB is Suggestions
 2011-12-09 14:28:40 -08:00
Gilles Debunne
48c5695417 am 47a4b78e: am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '47a4b78eb7c662cc12c68690ff57b4004c39980c':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:28:38 -08:00
Jeff Tinker
3861e1dc25 am aac2f9c6: am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'aac2f9c66ccb181544f822a1af7397a8e25455e7':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:28:36 -08:00
Jeff Brown
852c83ac93 am bdc18b28: am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit 'bdc18b28eb04b8c8cc00313096f8bfb142e407e3':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:28:34 -08:00
Jeff Brown
5f37008565 am fa7fa9a5: am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit 'fa7fa9a5ba796eabb2dadb8e2ce1b97da38e939e':
  Fix system hotkey handling.
 2011-12-09 14:28:32 -08:00
Gilles Debunne
683a485fbc am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
  IOOB is Suggestions
 2011-12-09 14:25:55 -08:00
Gilles Debunne
47a4b78eb7 am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:25:53 -08:00
Jeff Tinker
aac2f9c66c am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:49 -08:00
Jeff Brown
bdc18b28eb am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:25:41 -08:00
Jeff Brown
fa7fa9a5ba am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.
 2011-12-09 14:25:38 -08:00
Jack Palevich
9d4fe1abab am ec3a88de: Merge "Fix convert8To4, convert8To5" 
* commit 'ec3a88dee2c7d77c09eaad0c297f077744033d48':
  Fix convert8To4, convert8To5
 2011-12-09 14:21:22 -08:00
Jack Palevich
ec3a88dee2 Merge "Fix convert8To4, convert8To5" 2011-12-09 14:19:39 -08:00
Jack Palevich
0501f8a913 Fix convert8To4, convert8To5 
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.

Fixes b/5680952

Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
 2011-12-09 14:06:07 -08:00
Romain Guy
24edca8b52 Code cleanup 
Change-Id: If92e3addfc4d8546a60edcdea60a1fc89c27b680
 2011-12-09 13:08:06 -08:00
Romain Guy
05bbde70fd Free up resources by deleting shaders early on 
Change-Id: I29a39775732c0a48d3e6823f7afa3e741cae8541
 2011-12-09 12:55:37 -08:00
Irfan Sheriff
d837e370b2 am 1108e8dd: Merge "Change RSSI notification levels to 5 in framework" 
* commit '1108e8ddad3ddf0dbc660229ca3be6de7f600c3a':
  Change RSSI notification levels to 5 in framework
 2011-12-09 12:45:16 -08:00
Irfan Sheriff
1108e8ddad Merge "Change RSSI notification levels to 5 in framework" 2011-12-09 12:43:28 -08:00
Irfan Sheriff
ea933cb3fd Change RSSI notification levels to 5 in framework 
At some point the system UI switched to using 5 rssi levels
while the framework only broadcasts a change for 4 levels.

Hence RSSI change can be slow to be displayed on the UI, fix this

Bug: 5732700
Change-Id: I21700f96ba7a8dd678fb2ccfff8ef59f9b696666
 2011-12-09 12:40:35 -08:00
Alex Sakhartchouk
1153a4237c Merge "Renaming some classes to clarify what is what." into graphics-dev 2011-12-09 12:40:31 -08:00
Alex Sakhartchouk
3fc86ec3d0 Renaming some classes to clarify what is what. 
Change-Id: Iaee63ffd96bc269e46bc052d333ba1a5e848bd13
 2011-12-09 12:38:26 -08:00
Romain Guy
fc085bed31 am 3f7be830: Merge "Enable dirty regions on newly created EGL surfaces" 
* commit '3f7be830f053265699f3b8cb18d709f84aa5d546':
  Enable dirty regions on newly created EGL surfaces
 2011-12-09 12:31:05 -08:00
Romain Guy
3f7be830f0 Merge "Enable dirty regions on newly created EGL surfaces" 2011-12-09 12:28:46 -08:00
Romain Guy
9477c6e658 Enable dirty regions on newly created EGL surfaces 
This change fixes an issue on some tiler architectures that do not
enable the swap buffer behavior by default on EGL surfaces.

Change-Id: Ibda1ae582da1a20afad3be9c3361080e72df5206
 2011-12-09 12:27:21 -08:00
Jeff Tinker
dc44e06ef3 am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-09 11:13:39 -08:00
Jeff Tinker
ef664f62a1 Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 2011-12-09 11:11:56 -08:00
Kristian Monsen
105c59cdb4 am 5aa2136d: Merge "Update string lengths, fix for bug 5732776" 
* commit '5aa2136ddfcccab853381316b1940efb1eb6679c':
  Update string lengths, fix for bug 5732776
 2011-12-09 11:01:19 -08:00
Alex Sakhartchouk
0c7f81166b am f8c1f1c1: Merge "Making UI a bit more responsive." 
* commit 'f8c1f1c17c4909e321f23a9cd603d4410cd03ce0':
  Making UI a bit more responsive.
 2011-12-09 11:01:16 -08:00
Narayan Kamath
01465315cb am e61fd281: Merge "Remove BlockingMediaPlayer." 
* commit 'e61fd281a8cb69ae45c5de4b160ab86226083152':
  Remove BlockingMediaPlayer.
 2011-12-09 11:00:55 -08:00
Romain Guy
f4720c1fce am d3209c1b: Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917" 
* commit 'd3209c1bb21ce026d4e41464740e3d8f57cdd56f':
  GenerationCache::get would return a random value instead of NULL Bug #5401917
 2011-12-09 11:00:34 -08:00
Mangesh Ghiware
c0c479646c am 66b2ff81: Update computation of reading level scale. 
* commit '66b2ff818bdc58465e54d7fc42772857c07fa262':
  Update computation of reading level scale.
 2011-12-09 11:00:32 -08:00
Joe Fernandez
a4f49ac528 am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-09 10:47:59 -08:00
Joe Fernandez
4b3227de17 am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-09 10:45:44 -08:00
Joe Fernandez
89c3bc3842 Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 2011-12-09 10:43:32 -08:00
Kristian Monsen
5aa2136ddf Merge "Update string lengths, fix for bug 5732776" 2011-12-09 10:12:41 -08:00
Alex Sakhartchouk
f8c1f1c17c Merge "Making UI a bit more responsive." 2011-12-09 10:04:27 -08:00
Kristian Monsen
ed4ea72879 Update string lengths, fix for bug 5732776 
Change-Id: Id668689085f542dae331eca197289ba45c5e4a5f
 2011-12-09 17:56:43 +00:00
Gilles Debunne
f107abec56 am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
  Blinking cursor in Talk
 2011-12-09 09:36:23 -08:00
Gilles Debunne
caf4ead320 Merge "Blinking cursor in Talk" into ics-mr1 2011-12-09 09:34:04 -08:00
Jeff Tinker
9f704f6c46 Fix drm flag setting missed in false drm recognition fix. 
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
 2011-12-09 09:09:08 -08:00
The Android Open Source Project
175d5d76b0 Reconcile with ics-mr1-release 
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
 2011-12-09 07:11:10 -08:00
The Android Automerger
1cc6131f6e merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 06:58:10 -08:00
Narayan Kamath
e61fd281a8 Merge "Remove BlockingMediaPlayer." 2011-12-09 06:30:14 -08:00
Steven Ross
ebc6fb46c2 Checking whether screen is on in constructor fixes 5658742 
Change-Id: Ic96c8dd9ee9e86000b0cbe22a7d068a8ee424448
 2011-12-09 09:28:29 -05:00
James Dong
406dd5d1e4 am aadbd80b: Fixed the false drm recognition. 
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
  Fixed the false drm recognition.
 2011-12-09 00:17:56 -08:00
James Dong
aadbd80b30 Fixed the false drm recognition. 
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
 2011-12-08 21:01:31 -08:00
Romain Guy
d3209c1bb2 Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917" 2011-12-08 18:51:03 -08:00
Romain Guy
46b9f7cc20 GenerationCache::get would return a random value instead of NULL 
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
 2011-12-08 18:50:27 -08:00
Gilles Debunne
17994a1d04 Blinking cursor in Talk 
I verified that this fixes the unblinking cursor problem in Talk.

Change-Id: I5e3e5c8ad5cf3d8479462495107bf93e5e4fb956
 2011-12-08 18:40:27 -08:00
Gilles Debunne
1742f20c66 am be5f49fb: Performance improvements for long text edition. 
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
  Performance improvements for long text edition.
 2011-12-08 18:35:22 -08:00