OSDN Git Service
Naveen Kalla [Thu, 21 Aug 2014 15:12:09 +0000 (15:12 +0000)]
am
30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
* commit '
30e6a232769fba0cc08a5e783582858c4b4add0d':
Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
Esteban Talavera [Thu, 21 Aug 2014 15:12:05 +0000 (15:12 +0000)]
am
a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
* commit '
a2cdeadd322a1d2cb0778fa44eee61fcd0aa1e41':
Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
Naveen Kalla [Sat, 2 Aug 2014 08:03:42 +0000 (01:03 -0700)]
Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.
Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.
Bug:
9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
Esteban Talavera [Thu, 21 Aug 2014 15:02:32 +0000 (15:02 +0000)]
am
5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev
* commit '
5f9653cec90ad88d94ee5c31b5de6010c4fb97a1':
Rename get/setBlockUninstall() to get/setUninstallBlocked()
vandwalle [Thu, 21 Aug 2014 15:02:28 +0000 (15:02 +0000)]
am
23e25851: Merge "per bssid blacklist" into lmp-dev
* commit '
23e258519b3c6e479bd748ce7bab624ca1ab088c':
per bssid blacklist
Esteban Talavera [Thu, 21 Aug 2014 14:58:17 +0000 (14:58 +0000)]
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 14:58:06 +0000 (14:58 +0000)]
Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev
vandwalle [Thu, 21 Aug 2014 14:55:10 +0000 (14:55 +0000)]
Merge "per bssid blacklist" into lmp-dev
Esteban Talavera [Wed, 20 Aug 2014 10:35:57 +0000 (11:35 +0100)]
Rename get/setBlockUninstall() to get/setUninstallBlocked()
As requested in the API review
Bug:
17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
John Reck [Thu, 21 Aug 2014 14:29:25 +0000 (14:29 +0000)]
am
d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev
* commit '
d6a934a9a86a293428ccff8b78eba42825dd09f8':
Run RevealAnimator on RT
Esteban Talavera [Thu, 21 Aug 2014 14:25:07 +0000 (14:25 +0000)]
am
58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev
* commit '
58dada0df65027cad970351b981f526e80052aef':
Remove setApplicationsHidden
John Reck [Thu, 21 Aug 2014 14:23:26 +0000 (14:23 +0000)]
Merge "Run RevealAnimator on RT" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 14:17:23 +0000 (14:17 +0000)]
Merge "Remove setApplicationsHidden" into lmp-dev
Jason Monk [Thu, 21 Aug 2014 14:15:09 +0000 (14:15 +0000)]
am
c93cf56b: Merge "Update VPN Icon to key." into lmp-dev
* commit '
c93cf56b7852120fc32d6e742a91a49efc9f5499':
Update VPN Icon to key.
Jason Monk [Thu, 21 Aug 2014 14:15:03 +0000 (14:15 +0000)]
am
e34fef3b: Don\'t stack toasts for every user press
* commit '
e34fef3b40889f30891fe12ff441edaa48544a7f':
Don't stack toasts for every user press
Jason Monk [Thu, 21 Aug 2014 14:06:52 +0000 (14:06 +0000)]
Merge "Update VPN Icon to key." into lmp-dev
Jason Monk [Tue, 19 Aug 2014 19:20:01 +0000 (15:20 -0400)]
Don't stack toasts for every user press
Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.
Also fix unlock strings to not use insertions because of problems
translating the context.
Bug:
16892731
Bug:
16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc
Ji-Hwan Lee [Thu, 21 Aug 2014 12:16:59 +0000 (12:16 +0000)]
am
155bf68b: TIF: Release main TvView on reset()
* commit '
155bf68b24989edd4600cb018e2f9efd4f75fd6f':
TIF: Release main TvView on reset()
Ji-Hwan Lee [Thu, 21 Aug 2014 08:53:15 +0000 (17:53 +0900)]
TIF: Release main TvView on reset()
Also, use WeakReference for TvView.sMainTvView.
Change-Id: I6eec1c9f907692f0fbfa96d80c7d1141eabde6e2
Adrian Roos [Thu, 21 Aug 2014 12:08:25 +0000 (12:08 +0000)]
am
4f933f8b: Merge "Fix broken brightness mirror" into lmp-dev
* commit '
4f933f8b0b0a28bd225042d4fb7b55ab19c81319':
Fix broken brightness mirror
Adrian Roos [Thu, 21 Aug 2014 11:58:43 +0000 (11:58 +0000)]
Merge "Fix broken brightness mirror" into lmp-dev
Adrian Roos [Wed, 20 Aug 2014 22:03:15 +0000 (00:03 +0200)]
Fix broken brightness mirror
Bug:
17136823
Change-Id: I5609b2d539db56ec235899c069a080c8a959d254
Niels Egberts [Thu, 21 Aug 2014 11:39:49 +0000 (11:39 +0000)]
am
14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
* commit '
14e9dc50e3a787c926e3d56e854945fc96b5d500':
Fixed spelling of android.nominative and updated some comments.
Niels Egberts [Thu, 21 Aug 2014 11:33:00 +0000 (11:33 +0000)]
Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 11:02:13 +0000 (11:02 +0000)]
am
977c20b6: Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
* commit '
977c20b6907cf3499d18a0208fcddb14dc8bcc3a':
Add apis for whitelisting IMEs and accessibility services.
Kenny Guy [Thu, 21 Aug 2014 10:54:25 +0000 (10:54 +0000)]
Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
Niels Egberts [Wed, 13 Aug 2014 14:22:53 +0000 (15:22 +0100)]
Fixed spelling of android.nominative and updated some comments.
Bug:
17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
Jessica Hummel [Thu, 21 Aug 2014 10:20:08 +0000 (10:20 +0000)]
am
8d8d2419: Merge "Strings: replace work space by work profile" into lmp-dev
* commit '
8d8d2419103aeedb6210a7bec644778285e18ee8':
Strings: replace work space by work profile
Jessica Hummel [Thu, 21 Aug 2014 10:08:56 +0000 (10:08 +0000)]
Merge "Strings: replace work space by work profile" into lmp-dev
Jessica Hummel [Tue, 19 Aug 2014 16:45:54 +0000 (17:45 +0100)]
Strings: replace work space by work profile
Change-Id: I3f2dd5f628a34e1df351b3f1a526f3d2beea3ece
bug:
16468412
Esteban Talavera [Thu, 21 Aug 2014 09:25:08 +0000 (10:25 +0100)]
Remove setApplicationsHidden
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.
Bug:
17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
Jinsuk Kim [Thu, 21 Aug 2014 06:01:48 +0000 (06:01 +0000)]
am
2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev
* commit '
2e84b6327b87481fbf1b7ad769361c10e50a1028':
CEC: Fix a bug not sending <Set Stream Path>
Jinsuk Kim [Thu, 21 Aug 2014 05:53:50 +0000 (05:53 +0000)]
Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev
Jinsuk Kim [Thu, 21 Aug 2014 05:33:02 +0000 (05:33 +0000)]
am
b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev
* commit '
b614b10f7c4b2015ba55c5cb601e9067c6b47398':
CEC: Invoke input change for RAP request from MHL device
Jinsuk Kim [Thu, 21 Aug 2014 05:31:40 +0000 (14:31 +0900)]
CEC: Fix a bug not sending <Set Stream Path>
Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).
Bug:
17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
Jinsuk Kim [Thu, 21 Aug 2014 05:26:18 +0000 (05:26 +0000)]
Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev
Junda Liu [Thu, 21 Aug 2014 04:49:19 +0000 (04:49 +0000)]
am
ace7e722: Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev
* commit '
ace7e722cf0cd1aacf0ee39fe2fbd8fde61ca98e':
Add getCdmaMdn and getCdmaMin as system api to telmgr.
Junda Liu [Thu, 21 Aug 2014 04:43:37 +0000 (04:43 +0000)]
Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev
Wei Wang [Thu, 21 Aug 2014 04:20:33 +0000 (04:20 +0000)]
am
50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev
* commit '
50a32a5e1d86cbfca574e73698daf50c2bf81fc4':
Fix threading issue for advertising.
Wei Wang [Thu, 21 Aug 2014 04:10:50 +0000 (04:10 +0000)]
Merge "Fix threading issue for advertising." into lmp-dev
Jae Seo [Thu, 21 Aug 2014 04:10:09 +0000 (04:10 +0000)]
am
9c179483: API Review: android.media.tv
* commit '
9c179483cb20f1933563a73dee85106694a06d1b':
API Review: android.media.tv
Jae Seo [Wed, 20 Aug 2014 06:36:02 +0000 (23:36 -0700)]
API Review: android.media.tv
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
string resource references for labels.
Bug:
17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
Jinsuk Kim [Wed, 20 Aug 2014 08:45:22 +0000 (17:45 +0900)]
CEC: Invoke input change for RAP request from MHL device
Transform RAP[ContentOn/Off] to input change event.
Bug:
17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
Svet Ganov [Thu, 21 Aug 2014 02:02:56 +0000 (02:02 +0000)]
am
2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev
* commit '
2b86b50b0f79b24cc2e738469dbfc2e0dc110cdb':
Notify app widget hosts when cross-profile providers change.
Svetoslav [Thu, 21 Aug 2014 02:02:52 +0000 (02:02 +0000)]
am
0ab2d34b: Merge "Using default system icon for print spooler" into lmp-dev
* commit '
0ab2d34bb6a182fc15994c3e212ea458a5f048f7':
Using default system icon for print spooler
Svetoslav [Thu, 21 Aug 2014 02:02:44 +0000 (02:02 +0000)]
am
d5f8a500: Merge "Update the "More options" button in printing." into lmp-dev
* commit '
d5f8a5008cf56e33b5bd99ed8ef80179691e0966':
Update the "More options" button in printing.
Wei Wang [Thu, 21 Aug 2014 02:02:39 +0000 (02:02 +0000)]
am
b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev
* commit '
b6f533534fce404f00b519ad963bf614747853cb':
Fix race condition for BluetoothLeScanner.
Christopher Tate [Thu, 21 Aug 2014 01:44:54 +0000 (01:44 +0000)]
am
54eaf4f8: Merge "Maintain transport connection through package updates" into lmp-dev
* commit '
54eaf4f85277483743827c52530df407e720a046':
Maintain transport connection through package updates
Adam Powell [Thu, 21 Aug 2014 01:28:15 +0000 (01:28 +0000)]
am
74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev
* commit '
74f2ad5da40a186d78647e4ab31bb39ad9a58957':
Fix measurement regression in ActionBarContainer
Robert Greenwalt [Thu, 21 Aug 2014 01:15:44 +0000 (01:15 +0000)]
am
251ccb52: Merge "Add config resource to overlay tcp buffer sizes." into lmp-dev
* commit '
251ccb52dff69b2e91b8795756d8ef1a2dd46386':
Add config resource to overlay tcp buffer sizes.
Robert Greenwalt [Thu, 21 Aug 2014 01:15:38 +0000 (01:15 +0000)]
am
3a494857: Merge "Avoid reusing a currently active NetID." into lmp-dev
* commit '
3a494857919ee37e1decb9c09e6f663ede89b271':
Avoid reusing a currently active NetID.
Robert Greenwalt [Thu, 21 Aug 2014 01:15:33 +0000 (01:15 +0000)]
am
c0674366: Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev
* commit '
c067436609984a06fd95355b06e180ef8d9801e1':
Fix listening NetworkRequests to listen for all networks.
Robert Greenwalt [Thu, 21 Aug 2014 01:15:29 +0000 (01:15 +0000)]
am
7f07196d: Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev
* commit '
7f07196d232adb4e78f9e43d5bd1e28d39ec832e':
Add missing break statements to avoid unnecessary network validation.
Robert Greenwalt [Thu, 21 Aug 2014 01:15:14 +0000 (01:15 +0000)]
am
dd387b4a: Merge "Fix CS/NetworkMonitor race." into lmp-dev
* commit '
dd387b4a63394918c758c745995f4f09785dfccc':
Fix CS/NetworkMonitor race.
Jason Monk [Thu, 21 Aug 2014 01:15:08 +0000 (01:15 +0000)]
am
45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev
* commit '
45959a5e4f0eb42e1e18cd563a9cf56d5c9dd65b':
Fix SOCKS proxies from being dropped from PAC
Guang Zhu [Thu, 21 Aug 2014 00:50:38 +0000 (00:50 +0000)]
am
6c2d3ce6: Merge "follow up minor fixes for connectivity manager test" into lmp-dev
* commit '
6c2d3ce66163a78f407f596a496a97c1d62aa871':
follow up minor fixes for connectivity manager test
Adam Powell [Thu, 21 Aug 2014 00:50:34 +0000 (00:50 +0000)]
am
c33bc746: Merge "Unify code paths for collapsing action views in action bars" into lmp-dev
* commit '
c33bc746d05f9896dc1f12f8c6bba5fb53c6a2b8':
Unify code paths for collapsing action views in action bars
Guang Zhu [Thu, 21 Aug 2014 00:36:47 +0000 (00:36 +0000)]
am
e046262d: Merge "fixes for connectivity manager test suite" into lmp-dev
* commit '
e046262d2d5883b800187a558c32883e1b87d33d':
fixes for connectivity manager test suite
Amit Mahajan [Thu, 21 Aug 2014 00:36:43 +0000 (00:36 +0000)]
am
5b821459: Merge "Adding APIs to get IMEI/MEID" into lmp-dev
* commit '
5b8214597f6518132643bcd0ce37fa8d1ff6375a':
Adding APIs to get IMEI/MEID
Chris Craik [Thu, 21 Aug 2014 00:36:37 +0000 (00:36 +0000)]
am
d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev
* commit '
d093d695c8be9a25642de5433521a5cb9e230f01':
Add bounds checking to nine patch scaling
Lorenzo Colitti [Thu, 21 Aug 2014 00:28:13 +0000 (00:28 +0000)]
am
aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev
* commit '
aebd7b79eabf3ea775b5cc25b72cebacadb9a943':
Update state to failed if the VPN fails to connect.
Svet Ganov [Thu, 21 Aug 2014 02:00:11 +0000 (02:00 +0000)]
Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev
Christopher Tate [Thu, 21 Aug 2014 01:34:37 +0000 (01:34 +0000)]
Merge "Maintain transport connection through package updates" into lmp-dev
Christopher Tate [Wed, 20 Aug 2014 00:05:31 +0000 (17:05 -0700)]
Maintain transport connection through package updates
When a package is updated, existing bindings to that package's
services are severed and must be manually re-established. Now
that the transport can be updated outside the system per se,
make sure that we detect these cases and rebind as needed.
Bug
16139912
Change-Id: I5d6fa75bb86484f8f7d4f8e93c9157773995e6a7
Svetoslav [Thu, 21 Aug 2014 01:58:38 +0000 (01:58 +0000)]
Merge "Update the "More options" button in printing." into lmp-dev
Adam Powell [Thu, 21 Aug 2014 01:17:36 +0000 (01:17 +0000)]
Merge "Fix measurement regression in ActionBarContainer" into lmp-dev
Adam Powell [Thu, 21 Aug 2014 01:15:30 +0000 (18:15 -0700)]
Fix measurement regression in ActionBarContainer
Make sure that we take into account all child views (including
ActionBarContextViews) when measuring the action bar container to
determine the measurement influence of an additional tab bar.
Bug
16982971
Change-Id: I53ba7e9a4c9e36d97c6385d2007a3ee0a4e2bc77
Adam Powell [Thu, 21 Aug 2014 00:37:53 +0000 (00:37 +0000)]
Merge "Unify code paths for collapsing action views in action bars" into lmp-dev
Adam Powell [Thu, 21 Aug 2014 00:33:24 +0000 (17:33 -0700)]
Unify code paths for collapsing action views in action bars
This reverts a well-intentioned bugfix that made
ActionBarOverlayLayout focusable in touch mode and caused issues with
some activity layouts. Removes the associated key handling code for
the Back key in ActionBarOverlayLayout and handles it at a higher
level in Activity instead. (This same code path was already in use by
ToolbarActionBar.)
Bug
17105724
Change-Id: I57e4cace44a6d11f25a2549644b565446d616a52
Amit Mahajan [Thu, 21 Aug 2014 00:32:14 +0000 (00:32 +0000)]
Merge "Adding APIs to get IMEI/MEID" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 00:29:13 +0000 (00:29 +0000)]
Merge "Add bounds checking to nine patch scaling" into lmp-dev
Yorke Lee [Thu, 21 Aug 2014 00:14:04 +0000 (00:14 +0000)]
am
0719e606: Merge "Make AudioState modes static constants" into lmp-dev
* commit '
0719e60653d7e328ce6d810f3a58d13fc58f089c':
Make AudioState modes static constants
Guang Zhu [Thu, 21 Aug 2014 00:34:11 +0000 (00:34 +0000)]
Merge "fixes for connectivity manager test suite" into lmp-dev
Guang Zhu [Mon, 18 Aug 2014 23:18:00 +0000 (16:18 -0700)]
fixes for connectivity manager test suite
* reduced visibility of most util functions in
ConnectivityManagerTestBase
* reimplemented various waitFor... util function in base class:
instead of relying on received broadcast and synchronization
mechanism, we just poll for what we want with a fixed interval
and a max timeout
* minor style fixes
* removed state transition checks in all test cases of
ConnectivityManagerMobileTest: since exact state transitions
are not that interesting, we just care about if we reach a
particular state and if all network interfaces are in their
corresponding states
* clarified in comment what each test cases are testing, since
some of the test case names are not very straightforward
* any wait for DISCONNECTED checkes with ConnectivityManager are
temporarily commented out
Change-Id: I99cca95c33c6060909e0df684969b75c2dca23a9
Svetoslav [Thu, 21 Aug 2014 01:59:09 +0000 (01:59 +0000)]
Merge "Using default system icon for print spooler" into lmp-dev
Guang Zhu [Thu, 21 Aug 2014 00:47:30 +0000 (00:47 +0000)]
Merge "follow up minor fixes for connectivity manager test" into lmp-dev
Guang Zhu [Thu, 21 Aug 2014 00:40:18 +0000 (17:40 -0700)]
follow up minor fixes for connectivity manager test
Change-Id: I8f0606890b21d67130efb3bc02c6825823060139
Lorenzo Colitti [Thu, 21 Aug 2014 00:19:04 +0000 (00:19 +0000)]
Merge "Update state to failed if the VPN fails to connect." into lmp-dev
Amit Mahajan [Tue, 19 Aug 2014 00:49:59 +0000 (17:49 -0700)]
Adding APIs to get IMEI/MEID
Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
Jeff Davidson [Thu, 21 Aug 2014 00:02:07 +0000 (00:02 +0000)]
am
709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
* commit '
709941fd34e02fb6639ab31e04404b023c820dec':
Less intrusive VPN dialog and other UX tweaks.
Diego Pontoriero [Thu, 21 Aug 2014 00:02:03 +0000 (00:02 +0000)]
am
dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
* commit '
dede685497ef4be3c58cd1472f92540f27a2a14b':
Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
Amith Yamasani [Wed, 20 Aug 2014 23:52:25 +0000 (23:52 +0000)]
am
d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev
* commit '
d5d82cf3fe07254eb35aea05c06473f81ab0e316':
Add a hidden method to query profile owner name for a user
Jorim Jaggi [Wed, 20 Aug 2014 23:52:21 +0000 (23:52 +0000)]
am
61dfef79: Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev
* commit '
61dfef79fc6e2a3d61314f378f38aef381cb1393':
Accessibility actions for lock/phone/camera icon
John Reck [Wed, 20 Aug 2014 23:52:17 +0000 (23:52 +0000)]
am
876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev
* commit '
876f1a1ad2216bceaf437a5737f804bd7e355372':
Implement full View.buildLayer
Alan Viverette [Wed, 20 Aug 2014 23:52:13 +0000 (23:52 +0000)]
am
a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev
* commit '
a4fb61a68eabd71bae9cbf58f0007704a1551aab':
Forward additional drawable methods in AVD
Chris Craik [Wed, 20 Aug 2014 23:31:57 +0000 (16:31 -0700)]
Add bounds checking to nine patch scaling
bug:
17114103
Better handle the case, when scaling the divs in a nine patch, where
divs fall outside of the bounds of the bitmap.
Change-Id: I244b9c45b938c2a15f29e4563a86825ee9439b5f
Lorenzo Colitti [Wed, 20 Aug 2014 23:01:44 +0000 (16:01 -0700)]
Update state to failed if the VPN fails to connect.
Without this, the VPN settings dialog stays in "Connecting..."
forever.
Bug:
17140195
Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee
Jason Monk [Wed, 20 Aug 2014 22:22:37 +0000 (22:22 +0000)]
am
a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev
* commit '
a765518fc82854224e156431c573bf8492545087':
Lock task doesn't always end properly.
Sailesh Nepal [Wed, 20 Aug 2014 22:22:32 +0000 (22:22 +0000)]
am
9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev
* commit '
9c59bd75a24d1af3fa987c95950354ed1e6e7266':
Clean up and fix bugs in ConnectionService.createConnection
Tenghui Zhu [Wed, 20 Aug 2014 22:22:27 +0000 (22:22 +0000)]
am
36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev
* commit '
36f1b53f43c63db4bac3b18dba7fc96d85a50055':
Revert "Revert "Update indeterminate linear progress bar""
Jeff Brown [Wed, 20 Aug 2014 22:22:23 +0000 (22:22 +0000)]
am
ddc35381: Reset auto-brightness setting to default.
* commit '
ddc35381b014f7c65231036d9c8dd255680bca02':
Reset auto-brightness setting to default.
Jeff Brown [Wed, 20 Aug 2014 22:22:18 +0000 (22:22 +0000)]
am
2bc60f6e: Only select bluetooth route by default when A2DP is enabled.
* commit '
2bc60f6e8c990549eb9173c88c0e1457ceb9acd7':
Only select bluetooth route by default when A2DP is enabled.
Michael Wright [Wed, 20 Aug 2014 21:56:56 +0000 (21:56 +0000)]
am
f2516f7c: Add cleanspec for inputflinger removal
* commit '
f2516f7cb96ac5fd3f0dcb3db41891f94b0841be':
Add cleanspec for inputflinger removal
Diego Pontoriero [Wed, 20 Aug 2014 23:53:11 +0000 (23:53 +0000)]
Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
Jeff Davidson [Wed, 20 Aug 2014 23:59:29 +0000 (23:59 +0000)]
Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
Jeff Davidson [Mon, 11 Aug 2014 21:07:27 +0000 (14:07 -0700)]
Less intrusive VPN dialog and other UX tweaks.
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.
-The old persistent notification has been removed in favor of the new
Quick Settings UI.
-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.
Bug:
12878887
Bug:
16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
Alan Viverette [Wed, 20 Aug 2014 22:39:49 +0000 (22:39 +0000)]
Merge "Forward additional drawable methods in AVD" into lmp-dev
Tenghui Zhu [Wed, 20 Aug 2014 22:00:57 +0000 (22:00 +0000)]
Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev
Jeff Brown [Wed, 20 Aug 2014 21:32:38 +0000 (14:32 -0700)]
Reset auto-brightness setting to default.
Reset the auto-brightness setting to default since the behavior
of the feature is now quite different and is being presented to
the user in a new way as "adaptive brightness".
Bug:
17114082
Change-Id: Ica63f4caaaf50ad95dc9df88bb376f79782976f7
Jeff Brown [Wed, 20 Aug 2014 21:17:37 +0000 (14:17 -0700)]
Only select bluetooth route by default when A2DP is enabled.
Bug:
15756471
Change-Id: I822e51742e009b473000b8d67ec9c9a81c39b702