Wink Saville
2417f0aee5
am 110b8a4c: am cd3ec73f: Add getAvailableNetworks.
...
* commit '110b8a4cfe65991eeea2440b6b3d8ef7826f26a9':
Add getAvailableNetworks.
2011-10-24 12:50:41 -07:00
Wink Saville
110b8a4cfe
am cd3ec73f: Add getAvailableNetworks.
...
* commit 'cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
2011-10-24 12:46:21 -07:00
Svetoslav Ganov
339dc6c245
am bddc8354: Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
...
* commit 'bddc835436f4ebaf902bfcb69715a736bcaa102a':
Adding APIs to enable reporting virtual view hierarchies to accessibility serivces.
2011-10-24 12:07:01 -07:00
Svetoslav Ganov
bddc835436
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
2011-10-24 12:05:38 -07:00
Peter Ng
4c4153aab5
am 723fe126: Merge "Stat notify image update"
...
* commit '723fe12644c7758772cb0b119cfcf73b30a6e4e0':
Stat notify image update
2011-10-24 11:24:27 -07:00
Wink Saville
cd3ec73f0c
Add getAvailableNetworks.
...
To allow a operator test to pass we need to manually select
a network. Therefore getAvailableNetworks needs to be implemented
on CDMALTEPhone so that RIL_REQUEST_QUERY_AVAILABLE_NETWORKS is
sent to the RIL/radio.
Bug: 5420630
Change-Id: I8e138b211d42755399a9e30f3e45dde2f579401e
2011-10-24 11:10:36 -07:00
Peter Ng
723fe12644
Merge "Stat notify image update"
2011-10-24 10:55:30 -07:00
The Android Open Source Project
f79d731874
am 3c5b65c9: Reconcile with ics-mr0-release
...
* commit '3c5b65c95ea4814cbf9c0a3904a9ee13cf41d5c3':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
2011-10-24 07:44:45 -07:00
The Android Open Source Project
3c5b65c95e
Reconcile with ics-mr0-release
...
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
2011-10-24 06:32:19 -07:00
The Android Automerger
335978e729
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 23:22:41 -07:00
Jake Hamby
50f3603b28
am 3f06110d: Merge "Add support for SMS-PP data download to USIM."
...
* commit '3f06110dd0f0f72a38520482b85efa320f7be8e0':
Add support for SMS-PP data download to USIM.
2011-10-21 17:06:14 -07:00
Jake Hamby
3f06110dd0
Merge "Add support for SMS-PP data download to USIM."
2011-10-21 17:04:15 -07:00
Mathias Agopian
73182fc821
mDirtyRegion is single threaded, but could be accessed from a hwc thread
...
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug: 5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
2011-10-21 17:04:05 -07:00
Peter Ng
5eefe4e200
am cfb9df67: (-s ours) am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
...
* commit 'cfb9df6710b3bbb60dcd06bd65fb9ad1304cd348':
Do not merge - Recents background protection increased
2011-10-21 17:00:04 -07:00
Peter Ng
cfb9df6710
am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
...
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
2011-10-21 16:45:23 -07:00
Jake Hamby
ac09d2af14
Add support for SMS-PP data download to USIM.
...
Devices supporting IMS may receive SMS-PP data download messages
which are normally handled in the radio baseband. Add support to
framework for these messages, passing the data to the UICC and
sending the response data as part of the SMS ACK.
Change-Id: I1da76982c6f8c402f82a6f535591e614f4e0de18
2011-10-21 16:43:24 -07:00
Peter Ng
be25d5b056
Merge "Do not merge - Recents background protection increased" into ics-mr0
2011-10-21 16:42:49 -07:00
John Reck
08896e72c5
am b9c903fd: Merge "Fix rebuildWebTextView issues"
...
* commit 'b9c903fdfab4f889b8fad3b8cc05075efeb13f00':
Fix rebuildWebTextView issues
2011-10-21 16:37:30 -07:00
John Reck
b9c903fdfa
Merge "Fix rebuildWebTextView issues"
2011-10-21 16:35:50 -07:00
Xavier Ducrohet
fd5dee1254
am 2f4ce2ec: Merge "Fix software GL renderer."
...
* commit '2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955':
Fix software GL renderer.
2011-10-21 16:23:56 -07:00
Xavier Ducrohet
2f4ce2ecd0
Merge "Fix software GL renderer."
2011-10-21 16:22:15 -07:00
Xavier Ducrohet
f9e4551367
Fix software GL renderer.
...
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
2011-10-21 16:18:48 -07:00
Mike Lockwood
aa960113ff
Merge "SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED" into ics-aah
2011-10-21 16:09:30 -07:00
Mathias Agopian
c0f48f60f7
am 9ec98cd1: am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
...
* commit '9ec98cd134a3d698bc3ee7a62c02c7818e8b02af':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
2011-10-21 16:03:45 -07:00
Mathias Agopian
9ec98cd134
am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
...
* commit 'aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
2011-10-21 16:00:00 -07:00
Eric Fischer
0f4b48c45f
am 1625b2af: (-s ours) am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '1625b2af03640e810230c09953f6fbc381fb50b9':
Import revised translations. DO NOT MERGE
2011-10-21 15:59:35 -07:00
Eric Fischer
1625b2af03
am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
2011-10-21 15:57:54 -07:00
Mathias Agopian
aa938c8d9c
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
2011-10-21 15:57:45 -07:00
Eric Fischer
148d5bd855
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 15:56:22 -07:00
The Android Automerger
cbbf026a43
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 15:55:40 -07:00
Mathias Agopian
6497eabf0e
mDirtyRegion is single threaded, but could be accessed from a hwc thread
...
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug: 5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
2011-10-21 15:41:01 -07:00
Peter Ng
02d6fa5840
Do not merge - Recents background protection increased
...
Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
2011-10-21 15:37:28 -07:00
John Reck
c0e9fb91c8
Fix rebuildWebTextView issues
...
Bug: 5488135
Cherry pick from MR0
Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
2011-10-21 15:31:33 -07:00
Daniel Shiplacoff
5e04714dbe
am 6d93ea74: Merge "Recents background protection increased"
...
* commit '6d93ea74956277142213c5cf12b1eb5814ba7b7e':
Recents background protection increased
2011-10-21 15:24:26 -07:00
John Reck
12c2e92c87
am 59cf1dd6: am 8bf89f30: (-s ours) Fix the build
...
* commit '59cf1dd6aef51c2e19d9ca4e27618a261afbf4c4':
Fix the build
2011-10-21 15:24:25 -07:00
Peter Ng
11baab83d3
Stat notify image update
...
Change-Id: I39bd3df75f88ad0f39cdc24b29e9726e4ab9cf15
2011-10-21 15:24:17 -07:00
Daniel Shiplacoff
6d93ea7495
Merge "Recents background protection increased"
2011-10-21 15:22:54 -07:00
John Reck
59cf1dd6ae
am 8bf89f30: (-s ours) Fix the build
...
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
2011-10-21 15:22:11 -07:00
Adam Cohen
8ed55d26ed
am bd12e41b: am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
...
* commit 'bd12e41ba5e29ee95bc653ffaf5cbd9dbd11d0c9':
Removing fades on last item in StackView for major FPS improvement on Prime
2011-10-21 14:41:00 -07:00
John Reck
cec681dba9
am a26f7f16: (-s ours) am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* commit 'a26f7f169e8753085f9060ec23404785842696cb':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 14:40:59 -07:00
Dianne Hackborn
baf3743c0e
am 6ec96ec4: am 943da7b8: Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
...
* commit '6ec96ec4048ed71d5f07addb9605340d87829a9b':
Fix issue #5342788 : Setting wallpaper from gallery set default...
2011-10-21 14:40:54 -07:00
Adam Cohen
bd12e41ba5
am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
...
* commit 'e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
Removing fades on last item in StackView for major FPS improvement on Prime
2011-10-21 14:38:41 -07:00
John Reck
a26f7f169e
am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* commit '2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 14:38:32 -07:00
Dianne Hackborn
6ec96ec404
am 943da7b8: Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
...
* commit '943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #5342788 : Setting wallpaper from gallery set default...
2011-10-21 14:38:31 -07:00
Eric Fischer
66358bbd3e
Import revised translations. DO NOT MERGE
...
Change-Id: Ia333fa4ab1d72588e9c9ae4a9ef069eccdc9b485
2011-10-21 14:36:36 -07:00
John Reck
8bf89f305e
Fix the build
...
Change-Id: I822f75b3ed29e7817c7bd9ac5e2314b43831d2c1
2011-10-21 14:24:31 -07:00
Dirk Dougherty
d78631d594
am 7543b650: am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
...
* commit '7543b650227473c59b04086361eb9edfafe12c4e':
Doc change: fix typo in platform highlights.
2011-10-21 14:01:21 -07:00
Winson Chung
bd3a7ca895
am 19da321c: am 53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0
...
* commit '19da321c9a27c3cfaddd31cfd36ce30da2648b99':
Last update for screenshot animations for MR0. (Bug: 5333706)
2011-10-21 14:01:20 -07:00
Dianne Hackborn
79a4a93689
am 12b3e39e: am 4bbd71a6: Merge "Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped" into ics-mr0
...
* commit '12b3e39ecb56c35fc524fde62c26ed44a4b35c26':
Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped
2011-10-21 14:01:19 -07:00
Mike Lockwood
7772dbabe0
am 186e21d8: am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
...
* commit '186e21d8fb698ff491db3378789ef59570f0a879':
PowerManagerService: Enable light sensor debug output
2011-10-21 14:01:17 -07:00