Wink Saville
cae99e57fe
am 97d28d92: Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev
...
* commit '97d28d92c9a42db71d1855286fdd122e6b19ecef':
Unhide some CellSignalStrength methods.
2012-08-28 12:37:07 -07:00
Wink Saville
97d28d92c9
Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev
2012-08-28 12:34:22 -07:00
Jean-Baptiste Queru
416362e6d8
Merge "Change StringTokenizer to TextUtils.StringSplitter"
2012-08-28 12:22:39 -07:00
Wink Saville
82e6ee62b2
Unhide some CellSignalStrength methods.
...
When submitting originally I'd missed unhiding these methods.
Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
2012-08-28 12:05:16 -07:00
Jean-Baptiste Queru
e8f24cc267
am a3b63c00: am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
...
* commit 'a3b63c001cfd04121708e2bd67af5c8eb855baa1':
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:17:48 -07:00
Jean-Baptiste Queru
a3b63c001c
am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
...
* commit '337756fa6587bca84afdfdc964805f962ea534ed':
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:13:38 -07:00
Jean-Baptiste Queru
337756fa65
am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
...
* commit '78ad66b43cf5b649869de18ee9c246c95b135c10':
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c
Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
2012-08-28 10:43:10 -07:00
Przemyslaw Szczepaniak
2d27c5cb8d
am 70574efd: Fix threading issue in BlockingAudioTrack.
...
* commit '70574efd8f7105eb73a6ffe31992ed3c5971c8cc':
Fix threading issue in BlockingAudioTrack.
2012-08-28 02:24:17 -07:00
Przemyslaw Szczepaniak
70574efd8f
Fix threading issue in BlockingAudioTrack.
...
This fixes the issue where one thread calls .stop() on
mAudioTrack that was released (or being released) by other thread.
Bug: 7029291
Change-Id: Ia6db803e8ee40379b63327acf578466127cfabcb
2012-08-28 02:19:20 -07:00
Irfan Sheriff
5751fe4795
am c5fd6e59: Fix build
...
* commit 'c5fd6e59db10bb0069cf64394dce3955234757c1':
Fix build
2012-08-28 02:05:47 -07:00
Irfan Sheriff
c5fd6e59db
Fix build
...
Change-Id: Id17b70154b3f8a101457b20fb37db0a16159dff9
2012-08-28 02:02:21 -07:00
Irfan Sheriff
949dcad839
am da6da090: Captive portal handling
...
* commit 'da6da0907b28d4704aabbdb1bbeb4300954670d1':
Captive portal handling
2012-08-27 22:35:36 -07:00
Irfan Sheriff
da6da0907b
Captive portal handling
...
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.
Also, moved out captive portal handling out of wifi as a seperate component.
Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
2012-08-27 22:27:06 -07:00
Amith Yamasani
42ec61f970
am 10a0df84: Merge "Relax permission requirement for sending broadcasts to other users" into jb-mr1-dev
...
* commit '10a0df8459d22b29fb9163071e8cbc2bb7194393':
Relax permission requirement for sending broadcasts to other users
2012-08-27 19:35:43 -07:00
Amith Yamasani
10a0df8459
Merge "Relax permission requirement for sending broadcasts to other users" into jb-mr1-dev
2012-08-27 19:33:42 -07:00
Amith Yamasani
8bf06edac2
Relax permission requirement for sending broadcasts to other users
...
Also handle USER_CURRENT for broadcasts
Change-Id: I2df5616ac22b7c670a7d007b8d505d4d4d99a24e
2012-08-27 19:30:30 -07:00
Irfan Sheriff
e9395e1a3c
am bf3218f6: am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."
...
* commit 'bf3218f64de1692ca26c67b1911af856d81e186c':
Added a persistent feature in WiFi Direct.
2012-08-27 18:06:12 -07:00
Irfan Sheriff
bf3218f64d
am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."
...
* commit '129d6fac00545d6ea4eee75f25ddb3ffe8452bb9':
Added a persistent feature in WiFi Direct.
2012-08-27 18:03:51 -07:00
Irfan Sheriff
129d6fac00
am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."
...
* commit '67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
Added a persistent feature in WiFi Direct.
2012-08-27 17:57:29 -07:00
Irfan Sheriff
67ea8c8641
Merge "Added a persistent feature in WiFi Direct."
2012-08-27 17:54:07 -07:00
Jeff Brown
87f67b727c
am 5c807b4e: Merge "Fix improper use of CloseGuard." into jb-mr1-dev
...
* commit '5c807b4e84e193aed2062a97d3a4c840a72ea868':
Fix improper use of CloseGuard.
2012-08-27 17:23:47 -07:00
Jeff Brown
5c807b4e84
Merge "Fix improper use of CloseGuard." into jb-mr1-dev
2012-08-27 17:21:12 -07:00
Jeff Brown
b0af690dae
am 233c6670: Merge "Remove unused "layer" argument from show()." into jb-mr1-dev
...
* commit '233c667061ae0f5efcf4ea9409f36485a78f52c0':
Remove unused "layer" argument from show().
2012-08-27 17:19:43 -07:00
Jeff Brown
398a6cbe51
am dc7d8008: Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev
...
* commit 'dc7d8008eceb08850142fcd77a97404b4fbe688d':
Add plumbing for new surface flinger display API.
2012-08-27 17:19:39 -07:00
Jeff Brown
abd696f7d4
am ac66d4a8: Merge "Use new surface flinger API." into jb-mr1-dev
...
* commit 'ac66d4a8d653331a03c27d5444467fd943503c9b':
Use new surface flinger API.
2012-08-27 17:17:42 -07:00
Jeff Brown
233c667061
Merge "Remove unused "layer" argument from show()." into jb-mr1-dev
2012-08-27 17:17:40 -07:00
Jeff Brown
dc7d8008ec
Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev
2012-08-27 17:16:53 -07:00
Jeff Brown
ac66d4a8d6
Merge "Use new surface flinger API." into jb-mr1-dev
2012-08-27 17:15:25 -07:00
John Reck
12d8776b86
am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
...
* commit 'f920271828f654dec2a72240e73a940247f25315':
Protect against focus changes after .destroy()
2012-08-27 16:57:02 -07:00
John Reck
f920271828
Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
2012-08-27 16:54:18 -07:00
John Reck
1612fab07b
Protect against focus changes after .destroy()
...
Bug: 7026042
Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
2012-08-27 16:44:39 -07:00
alanv
b72fe7a263
Don't overwrite accessibility delegates in AbsListView items.
...
Bug: 6856579
Change-Id: I2963edcefdc0dd5e1413b57858e6f319904a269d
2012-08-27 16:44:25 -07:00
Baligh Uddin
dd7242262f
am 81efbb30: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '81efbb30f07d3c2d48b43659dd443ceb625505d2':
Import translations. DO NOT MERGE
2012-08-27 16:21:14 -07:00
Baligh Uddin
81efbb30f0
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:17:57 -07:00
Baligh Uddin
e7f484f26d
am 38b97a31: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '38b97a316c64f094d5fc2636a6634c6f4b580ab7':
Import translations. DO NOT MERGE
2012-08-27 16:14:46 -07:00
Baligh Uddin
38b97a316c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:11:39 -07:00
Dianne Hackborn
f748711d7b
am 0e17e5bc: Merge "Fix installing applications from non-primary users." into jb-mr1-dev
...
* commit '0e17e5bc43373ff9dd8d567f876a26f990ed638e':
Fix installing applications from non-primary users.
2012-08-27 16:02:52 -07:00
Dianne Hackborn
0e17e5bc43
Merge "Fix installing applications from non-primary users." into jb-mr1-dev
2012-08-27 15:59:56 -07:00
Charles Chen
3ff601e730
am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
...
* commit '40edfc97795e34b1f24b15ca8f0ccba37fa1efbc':
Reload page when A11y is on and the JavaScript state changes.
2012-08-27 15:45:34 -07:00
Charles Chen
40edfc9779
Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
2012-08-27 15:42:39 -07:00
alanv
c98b34608b
Reload page when A11y is on and the JavaScript state changes.
...
Bug: 6910403
Change-Id: I85af7d2019a02c1a6cc17b0c4930276b7fb69e33
2012-08-27 15:21:09 -07:00
The Android Open Source Project
92dc4a8230
am 5b3652cc: am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '5b3652ccc89e3f94080d810aa1149f09d221f413':
Empty DC's apnList when the DC is free.
2012-08-27 15:19:30 -07:00
Dianne Hackborn
786b44046a
Fix installing applications from non-primary users.
...
We also now send the correct broadcasts to each user.
You no longer need to be running the shell as root
to be able to create/remove users.
Also added some more man page material to the pm command, and
got rid of a bunch of showUsage() calls that now make error
messages completely buried because of how large the usage info
has become.
And the package manager now shows the user each historical broadcast
was sent to.
Change-Id: Iab42498e1352a0c023069139c80fc04d2d69ab4b
2012-08-27 15:16:33 -07:00
The Android Open Source Project
5b3652ccc8
am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit 'e9c7efda14e7d1c78e465e4208fec6fb6babce5d':
Empty DC's apnList when the DC is free.
2012-08-27 15:15:25 -07:00
Brian Muramatsu
6c0d4f00cb
am a97ec810: Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev
...
* commit 'a97ec810e0dd5fe493c1ac08545dcb7a9f93b723':
Remove unused IntentFilter in LocationManager
2012-08-27 15:14:14 -07:00
Adam Powell
c7c1d174b3
am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev
...
* commit 'ac137b3211818f9e72f9ffbaf541ad8a1ef27eb1':
Add setOnDismissListener to AlertDialog.Builder
2012-08-27 15:14:10 -07:00
Jeff Sharkey
f261d88f81
am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
...
* commit '116ee10b95ffff658618be42544ce80971ce28e8':
Always-on VPN.
2012-08-27 15:14:07 -07:00
Brian Muramatsu
a97ec810e0
Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev
2012-08-27 14:59:11 -07:00
Jeff Brown
3e7e7f025e
Fix improper use of CloseGuard.
...
Change-Id: I37131a86e27a4be55956384a3566de9dcfd90fe5
2012-08-27 14:34:55 -07:00