PauloftheWest
c932957d4e
am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
...
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
2014-09-18 16:00:59 +00:00
PauloftheWest
0f01eeff84
Merge "Removed an extraneous messge when pairing." into lmp-dev
2014-09-18 15:51:50 +00:00
Sander Alewijnse
61fc506eb3
am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
Update targetSdkVersion check.
2014-09-18 12:07:39 +00:00
Sander Alewijnse
0fe16796c5
am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit 'c995e73391bb4f46154d506f198ee4dec85bae4c':
Update targetSdkVersion check.
2014-09-18 11:56:32 +00:00
Sander Alewijnse
c995e73391
am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
Update targetSdkVersion check.
2014-09-18 11:46:11 +00:00
Sander Alewijnse
4241b0a962
Merge "Update targetSdkVersion check." into lmp-dev
2014-09-18 11:36:31 +00:00
Mark Salyzyn
0e77a346bb
am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
...
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
logd: settings: ro.config.low_ram support
2014-09-17 23:46:59 +00:00
Mark Salyzyn
2295581373
am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
...
* commit '5f288bc17c79c76090075db3a8a307c6421b9eb0':
logd: settings: ro.config.low_ram support
2014-09-17 23:32:07 +00:00
Mark Salyzyn
5f288bc17c
am 894af268: logd: settings: ro.config.low_ram support
...
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
2014-09-17 23:25:57 +00:00
Mark Salyzyn
894af268de
logd: settings: ro.config.low_ram support
...
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
2014-09-17 22:26:16 +00:00
PauloftheWest
10773b4d4d
Removed an extraneous messge when pairing.
...
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug: 17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
2014-09-17 14:46:14 -07:00
Amith Yamasani
aeec54f71d
am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit '2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
Don't allow creating a guest from a secondary user...
2014-09-17 20:38:49 +00:00
Amith Yamasani
2f8b417358
am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit 'ae2da7a90bd9dad3522611f1f105788e1d11fe81':
Don't allow creating a guest from a secondary user...
2014-09-17 20:28:06 +00:00
Amith Yamasani
ae2da7a90b
am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit '69b674656af869219189fe0f7985c011d29d9b7e':
Don't allow creating a guest from a secondary user...
2014-09-17 20:16:43 +00:00
Amith Yamasani
69b674656a
Merge "Don't allow creating a guest from a secondary user..." into lmp-dev
2014-09-17 20:06:59 +00:00
John Spurlock
4f6d252050
am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:59:34 +00:00
John Spurlock
ab4fe2d94f
am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit '9e51261dcc5db11be92660a3bde6b1f1e59ee128':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:53:54 +00:00
John Spurlock
9e51261dcc
am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:48:11 +00:00
John Spurlock
ae9d437b4a
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
2014-09-17 19:37:27 +00:00
PauloftheWest
13a63ef39b
am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.
...
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Increase char limit for translation.
2014-09-17 18:49:59 +00:00
PauloftheWest
63f9500e0d
am 08183704: am 3cc81aea: Increase char limit for translation.
...
* commit '0818370405da62d427620da5407ca4c5f9c969a0':
Increase char limit for translation.
2014-09-17 18:41:09 +00:00
PauloftheWest
0818370405
am 3cc81aea: Increase char limit for translation.
...
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
2014-09-17 18:30:12 +00:00
John Spurlock
2c52651577
Settings: Ensure CryptKeeper dismisses secure keyguards.
...
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.
Bug:17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
2014-09-17 13:33:38 -04:00
PauloftheWest
3cc81aeabf
Increase char limit for translation.
...
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
2014-09-17 08:30:09 -07:00
Amith Yamasani
f5d14b2aed
Don't allow creating a guest from a secondary user...
...
unless the primary user has allowed Guest and user creation from
lockscreen.
Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
2014-09-16 16:36:40 -07:00
Prem Kumar
24bfab6f23
am 02f66ba7: am 07e5ea99: am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '02f66ba78c67567275fca7fd994a9d3df023befe':
2014-09-16 20:32:54 +00:00
John Spurlock
6770d06345
am c9f6945f: am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit 'c9f6945fc80511de36c6e7029b49a0d322b9aaa5':
2014-09-16 20:31:48 +00:00
Tyler Gunn
0c07932111
am 2b3505ed: am 8bad5a2d: am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom.
...
* commit '2b3505edb2884f3b69cf805486ecfefe83992172':
2014-09-16 20:29:45 +00:00
Maurice Lam
b4f5e0bd61
am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:44:14 +00:00
Maurice Lam
2ffb10d28b
am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:36:47 +00:00
Maurice Lam
fd4e0f2567
am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
2014-09-16 18:47:07 +00:00
Maurice Lam
27d74fa288
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
2014-09-16 18:35:39 +00:00
Baligh Uddin
072f390b58
am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
Import translations. DO NOT MERGE
2014-09-16 18:22:37 +00:00
Maurice Lam
610fdf3343
[WifiSetup] Update connection state for auto-finish
...
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.
Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
2014-09-16 11:05:28 -07:00
Baligh Uddin
fbb0218a11
am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1741abb95c2a30cd10ba829aca345b3d919f3ef6':
Import translations. DO NOT MERGE
2014-09-16 18:03:21 +00:00
Baligh Uddin
1741abb95c
am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE
2014-09-16 15:26:42 +00:00
Paul Lawrence
158a291f63
am 36d8bd3b: am db51c76a: am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit '36d8bd3bf7267f38af9f53be7bce70d93b5f3bfa':
2014-09-16 15:21:16 +00:00
Kenny Guy
9d266fb852
am daa4a466: am 28d2fa62: am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'daa4a46633cc1175a8dcb3a60fe968d088dee377':
2014-09-16 15:21:15 +00:00
Alexandra Gherghina
6042208720
am 7a09535c: am cd321d81: am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit '7a09535c734cb9da9dcf66bef8b5265f0f65882a':
2014-09-16 15:21:14 +00:00
PauloftheWest
8d8c566934
am e438c383: am 6c1d69ba: am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit 'e438c38323f9e3132110ab561235b766d5e800c0':
2014-09-16 15:21:13 +00:00
Dianne Hackborn
1d463fb1e1
am f7acc1b3: am c857cddf: am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
...
* commit 'f7acc1b3115bee7536804ee77579eb213db67525':
2014-09-16 15:21:12 +00:00
Svetoslav
c73b179d59
am 0a91a8d2: am c33aef20: am c50841ca: am 85dcef12: Fix settings crash in print job screen.
...
* commit '0a91a8d24dd7098d31410f14a36067a7fe963ff4':
2014-09-16 15:21:11 +00:00
Vinit Deshpande
7ae64011ad
am 84912814: am 7aaccec0: am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '84912814f50934ddb8e6c968d829a00873037bb2':
2014-09-16 15:21:10 +00:00
Svetoslav
3ade85ec73
am 9af0fce6: am 536cb798: am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
...
* commit '9af0fce66a9262c5563a588dbc998f451ca40469':
2014-09-16 15:21:09 +00:00
Carlos Valdivia
afc3276323
am 4806e47d: am 456fbe88: am a8627dd8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '4806e47d55ff4797ba2a93c1f94414219d5358cb':
2014-09-16 15:21:08 +00:00
Baligh Uddin
6849828060
am 2dd62886: (-s ours) am f053f532: (-s ours) am a2e918af: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2dd62886faea7b923aa1abaf4e5e7b681c400ba7':
2014-09-16 15:21:08 +00:00
Dan Sandler
d446e4750a
am fecd8989: am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
...
* commit 'fecd8989854aaf09fd5f761ac863e116534e9177':
2014-09-16 15:21:07 +00:00
Zoltan Szatmary-Ban
f51abf9a64
am bc8f3d08: am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
2014-09-16 15:21:06 +00:00
Zoltan Szatmary-Ban
5b792c6b81
am 23496243: am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit '2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
2014-09-16 15:21:05 +00:00
Fabrice Di Meglio
5b871c7630
am 88ff5747: am a2bba88b: am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
...
* commit '88ff5747b67df59fd623b177a06bce86b5031fb8':
2014-09-16 15:21:04 +00:00