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

63695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f14dc29104 Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
Ben Murdoch
2ff8cc2438 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
Owen Lin
130f62ab01 Fix the build. (Change LOGV to ALOGV) 
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
 2011-12-12 16:17:34 +08:00
Raphael
7c3bef85da Merge "AAPT fix printf %zd crash on Windows". Do not merge. 
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Bug: 5742142

(cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b)

Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
 2011-12-11 13:59:02 -08:00
Makoto Onuki
95ea6d6d5d Merge "MCC detection fixes for CountryDetector" 2011-12-10 13:23:59 -08:00
Jeff Tinker
a5cbf023e3 Fix drm enumeration order, resolves failure to play forward lock ringtones 
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
 2011-12-09 20:04:17 -08:00
Andreas Huber
1f7817e146 am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00
Andreas Huber
61a8b5301b am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:09:19 -08:00
Svetoslav Ganov
47730f1582 am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-09 18:09:16 -08:00
Irfan Sheriff
ecd7798ce4 am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
  Handle emergency call back mode correctly
 2011-12-09 18:09:07 -08:00
Gilles Debunne
70511ade47 am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
  Make the Next key navigate between TextViews
 2011-12-09 18:09:03 -08:00
Gilles Debunne
2afcfa4239 resolved conflicts for merge of 5371a165 to master 
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
 2011-12-09 18:06:34 -08:00
Makoto Onuki
f9165b7e43 MCC detection fixes for CountryDetector 
- Don't get and cache phone tpe at the initialization time.  At this point
TelephonyManager is probably not ready yet.

- Refresh MCC whenever we get the service state changed callback, even when
the state hasn't actually changed, in order to make sure we get refresh
country properly when MCC changes.

- Also remove the initialization of mPhoneStateListener, which prevented us from
registering phone state listener properly.

- Also fix tests which were already failing.

Bug 5670680

Change-Id: Id45abeba1b1e843053ac2c946861b439ca568de4
 2011-12-09 17:55:18 -08:00
Robert Greenwalt
bb4fd0b444 Use the carrier-given dns addrs for tethering. 
This fixes a complaint from carriers (that we used 8.8.8.8), but also
fixes the case where there is only room for one live radio
connection: the secondary connection (tethering) doesn't have a
default route to prevent on-device traffic from slipping out on the
tethering connection, but tethered dns is proxied through dnsmasq, so
it is appearing as on-device traffic and is unroutable.  By switching
to the carrier-indicated dns servers we can use the host-routes
already set for those and kill two bugs with one fix.

bug:5525764
bug:3045311
Change-Id: Ib1ccea81e0c0ed2d1462dc9721c2647124a790da
 2011-12-09 17:12:03 -08:00
Claudia de Veaux
f3aa0f78ff Merge "Edit to string to change "double-touch" to "double-tap" per standard language." 2011-12-09 16:42:11 -08:00
Steven Ross
e4067faca9 Merge "Checking whether screen is on in constructor fixes 5658742" 2011-12-09 16:28:39 -08:00
The Android Automerger
c721ba76a4 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:17:04 -08:00
Justin Ho
df83cfc95c am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
  Quick settings icons updated to match ics style on tablet
 2011-12-09 15:43:48 -08:00
Justin Ho
1cec30a182 Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 2011-12-09 15:42:10 -08:00
Amith Yamasani
b066fcc0d8 Dump system and secure settings in bugreport. 
Change-Id: I19b7bf83c160b1bd5ce79e64886a9a76b91217b3
 2011-12-09 15:22:39 -08:00
Andreas Huber
9f62e15f40 Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler 
contributed by Samsung (untested).

Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
 2011-12-09 15:09:56 -08:00
Jamie Gennis
798b9cdf8c SurfaceTexture: fix a verbose-log compile error 
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
 2011-12-09 15:07:44 -08:00
Irfan Sheriff
c4ea8dfd46 Remove explicit network disabling code 
We are going to always disable the notification

Bug: 5556629
Change-Id: I981eb55a1bb6f44defd674e3a86d9c6f3805f4fc
 2011-12-09 15:06:20 -08:00
Eric Fischer
049bc558b3 am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
  Import revised translations. DO NOT MERGE
 2011-12-09 14:58:10 -08:00
The Android Open Source Project
57c82bf0bc am abe0ed49: am 641a5624: Reconcile with ics-mr0-release 
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
 2011-12-09 14:58:07 -08:00
The Android Open Source Project
e2d4301f71 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 14:57:48 -08:00
Claudia de Veaux
c4c1ff90be Edit to string to change "double-touch" to "double-tap" per standard language. 
Bug: 5163232
Change-Id: Ifa045b16f52623005308a3ce9e4086c4e9e4590b
 2011-12-09 14:42:54 -08:00
Nick Pelly
1db7a31a45 Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 2011-12-09 14:37:05 -08:00
Nick Pelly
8c9d01391c Merge "Fix BasicNfcEeTest java package." 2011-12-09 14:36:23 -08:00
Nick Pelly
75596b4545 Add BluetoothAdapter.getRemoteDevice(byte[]) 
This is useful for NFC->BT hand-over, where we are already working with bytes.

Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
 2011-12-09 14:35:38 -08:00
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
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
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
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
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
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