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

62397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
6c932dab1c am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '02ed923da995a10c537018861cfc149d04c66bc2':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:54 -08:00
Gilles Debunne
664d87ef01 am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
  IME action (done, next...) correctly handled
 2011-11-17 05:45:29 -08:00
Kristian Monsen
ec2b01e788 Merge "Fix fix for bug 2816327" 2011-11-17 05:43:40 -08:00
Alex Sakhartchouk
e693fa3e18 am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit 'a962ef2993099e6c5db3809a7e829e43c8cf084a':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-17 04:08:30 -08:00
Fred Chung
d2789aa322 am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit 'd592714d9a48afce69d6904fc539f150b7c02898':
  Bluetooth HDP sample.
 2011-11-17 04:08:28 -08:00
The Android Open Source Project
d949edddc0 am 4dce941e: am 816e68e2: No-op merge from ics-mr0 
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
 2011-11-17 04:08:27 -08:00
Ben Murdoch
e6269f7988 am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:15:40 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:13:19 -08:00
Jeff Sharkey
66b570c704 am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
 2011-11-16 23:01:15 -08:00
Jeff Sharkey
b9df01d396 Merge "Update NTP outside locks, log large trim events." into ics-mr1 2011-11-16 22:59:13 -08:00
Daniel Sandler
a092482c17 am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-16 22:35:30 -08:00
Daniel Sandler
7fd3ba9149 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
 2011-11-16 22:35:28 -08:00
Daniel Sandler
293f861aab Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 2011-11-16 22:33:55 -08:00
Daniel Sandler
d5decdccc6 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
David Brown
277b13e091 SIP addresses containing "911" shouldn't be considered emergency calls 
This change updates isEmergencyNumberInternal() to always return false if
you pass in a SIP address, since the concept of "emergency numbers" is
only meaningful for calls placed over the cell network.

Previously we *did* try to compare SIP addresses against the list of known
emergency numbers, which caused bad behavior with SIP addresses that even
contained "911"/"112"/etc as a substring (since we were filtering out
non-dialable characters before doing the comparison!)

TESTED:

  - Before this change, calls to "abc911def@example.com" or
    "911abcdef@example.com" were incorrectly detected as emergency
    numbers, and fail.

  - After this change, SIP addresses like "abc911def@example.com" and
    "911abcdef@example.com" work fine.

  - Also, confirmed that this change doesn't break the restriction that
    3rd party apps shouldn't be able to make emergency calls.

    Specifically, I fired off ACTION_CALL intents (using the CallDialTest
    activity) for a bunch of numbers *similar* to emergency numbers, and
    confirmed that none of them actually resulted in an emergency call
    being placed.
    The specific ACTION_CALL intents I tested were:
      "911"         ==> Didn't place the call; brought up dialer instead
      "tel:911"     ==> Didn't place the call; brought up dialer instead
      "911@foo"     ==> Tried to start a SIP call (which failed)
      "911%40foo"     ==> Tried to start a SIP call (which failed)
      "tel:911@foo" ==> Tried to start a SIP call (which failed)
      "tel:911%40foo" ==> Tried to start a SIP call (which failed)
      "911@example.com" ==> Tried to start a SIP call (which failed)
      "sip:911"     ==> Didn't place the call; brought up dialer instead
      "sip:911@foo" ==> Tried to start a SIP call (which failed)
      "sip:911%40foo" ==> Tried to start a SIP call (which failed)

Bug: 5515452
Change-Id: I6f9f8690b08564c53c7a76f480654477b475d94d
 2011-11-16 21:14:11 -08:00
Mathias Agopian
2030d78dc9 am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1 
* commit '8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
  be a bit more defensive when parsing extension strings
 2011-11-16 21:00:52 -08:00
Mathias Agopian
8fc3540fdf Merge "be a bit more defensive when parsing extension strings" into ics-mr1 2011-11-16 20:59:30 -08:00
Nicolas Roard
e788fa84f1 am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 
* commit 'e88ca718ed9af788f2dc46b5f2db494906bbf41d':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-16 19:42:07 -08:00
Nicolas Roard
e88ca718ed Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe Hack to workaround the fact that the EGL context can be 
removed from under us by framework in low memory condition.

bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
 2011-11-16 19:31:00 -08:00
Matthew Xie
37fb92fb63 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-16 18:25:04 -08:00
Mathias Agopian
f14ce7db5d am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit '1125f89e47b06b12a0e047d64f1ef953d0c48489':
  remove hack that hardcoded the refresh rate
 2011-11-16 18:22:26 -08:00
Matthew Xie
302afb93d4 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
1125f89e47 Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Amith Yamasani
5cd1500cc4 Don't upgrade some settings from GB to ICS. 
Copy the value of AUTO_TIME to AUTO_TIME_ZONE.
Don't upgrade screen timeout and auto brightness.

Bug: 5607851, 5217460

Also fix the default for vibrate mode. Bug: 5553900

Change-Id: I1b8d5215d55953f2b686e77bf55fd07110a08b8d
 2011-11-16 18:09:15 -08:00
Mangesh Ghiware
5511635090 am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
 2011-11-16 18:03:51 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
Jeff Sharkey
684c54a2eb Update NTP outside locks, log large trim events. 
Move NTP updates outside locks to avoid blocking ShutdownThread.  Add
logging around trim events that remove substantial history.  Include
history start in sample events.

Bug: 5627247, 5584564
Change-Id: If9bbd93842c710efcdec94e68da87e9e42a5f961
 2011-11-16 17:58:47 -08:00
Steven Ross
b076bfc5e3 Merge "Not showing facelock when plugging/unplugging fixes 5438524" 2011-11-16 17:46:44 -08:00
satok
9e502e90b5 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
 2011-11-16 17:37:46 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
8b9ba6fa88 am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
 2011-11-16 17:16:54 -08:00
Matthew Xie
0901e601b5 Call notifyIncomingA2dpConnection with correct rejected status 
notifyIncomingA2dpConnection was called with wrong rejected status.
Fix this.
bug 5626476

Change-Id: Ie8e4a8bdc6f6357a62172c86c21ee547376952a4
 2011-11-16 17:14:36 -08:00
Daniel Sandler
e11bcd1d72 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
 2011-11-16 17:14:30 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
5311917df5 Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
John Reck
f9a6c91f75 Fix add single character check 
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
 2011-11-16 16:58:56 -08:00
Mathias Agopian
47ab60e93f be a bit more defensive when parsing extension strings 
hopefully this will fix a crash in the emulator.

Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
 2011-11-16 16:49:25 -08:00
Nick Pelly
a5193b24c1 Fix NPE on devices that don't have NFC. 
We should return null instead of NPE.

Bug: 5622939
Change-Id: I802f4a99ea9f5e73453d5ea30da4e1d9fa279b9c
 2011-11-16 16:49:01 -08:00
satok
060677f468 Clean up the spell checker framework 
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
 2011-11-17 09:40:56 +09:00
Mathias Agopian
abdade71bc am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit '69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-16 16:16:11 -08:00
Mathias Agopian
69c17a11a2 Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
db5494c406 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" 
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
 2011-11-16 15:59:13 -08:00
Glenn Kasten
376c393039 MidiFile uses C++ Thread not createThreadEtc 
This permits leveraging future improvements to Thread.

Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
 2011-11-16 15:43:31 -08:00
Matthew Xie
6da97a24e3 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00
Fred Chung
6cf8f73586 Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e. 
Change-Id: I23f7d4ece831ea449ecfc848dbb5733021107350
 2011-11-16 15:28:35 -08:00
Glenn Kasten
9c0227a63c JetPlayer uses C++ Thread not createThreadEtc 
This permits leveraging future improvements to Thread.

Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
 2011-11-16 15:25:30 -08:00
Fred Chung
2d410df1c7 DO NOT MERGE: Bluetooth HDP sample. 
Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

Change-Id: I6f9bd5fec6e841395b9fc85d419510c81bfb620c
 2011-11-16 15:24:08 -08:00
Glenn Kasten
3cce14e8ff Merge "Bug 4903178 Restore priority and cgroup on stop" 2011-11-16 15:11:20 -08:00
Marco Nelissen
3de6891865 am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit 'e937da83143d67fbd709d37bd7418f9807e72baa':
  Change MediaController look b/5584613
 2011-11-16 14:57:23 -08:00