OSDN Git Service
Dan Sandler [Thu, 11 Sep 2014 16:01:27 +0000 (16:01 +0000)]
am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 16:01:24 +0000 (16:01 +0000)]
am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 16:01:14 +0000 (16:01 +0000)]
am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
Fabrice Di Meglio [Thu, 11 Sep 2014 15:59:01 +0000 (15:59 +0000)]
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 '
f8310c18508275b1125e7677579fd610cecf29c6':
Fix bug #
17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
PauloftheWest [Thu, 11 Sep 2014 15:58:20 +0000 (15:58 +0000)]
am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
Jim Miller [Thu, 11 Sep 2014 15:57:42 +0000 (15:57 +0000)]
am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
ca03758ed6399d73c841bec8685ea1f19bf38fea':
Keep unlock attempt count after configuration change
Baligh Uddin [Thu, 11 Sep 2014 15:49:23 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Dan Sandler [Thu, 11 Sep 2014 11:58:54 +0000 (11:58 +0000)]
Merge "Show a better list of apps." into lmp-dev
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 10:52:56 +0000 (10:52 +0000)]
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 09:23:53 +0000 (09:23 +0000)]
Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
Fabrice Di Meglio [Thu, 11 Sep 2014 00:23:32 +0000 (00:23 +0000)]
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
Fabrice Di Meglio [Wed, 10 Sep 2014 23:35:36 +0000 (16:35 -0700)]
Fix bug #
17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
- close the stream properly in all cases
Change-Id: I3a593be534ea444a2e2659458918cce221891456
PauloftheWest [Wed, 10 Sep 2014 22:51:47 +0000 (15:51 -0700)]
Added bluetooth_device_settings_header to fix build breakage.
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
PauloftheWest [Wed, 10 Sep 2014 22:20:37 +0000 (22:20 +0000)]
am
1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '
1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
Made Bluetooth device dialog fully scrollable.
Jim Miller [Wed, 10 Sep 2014 22:18:22 +0000 (22:18 +0000)]
Merge "Keep unlock attempt count after configuration change" into lmp-dev
PauloftheWest [Wed, 10 Sep 2014 22:11:56 +0000 (22:11 +0000)]
Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
John Spurlock [Wed, 10 Sep 2014 22:06:09 +0000 (22:06 +0000)]
am
31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '
31915522b764a097c5d660cb933d4acb5eb0fcb4':
Settings: Remove fixed dropdown width from "From" pref.
John Spurlock [Wed, 10 Sep 2014 21:49:28 +0000 (17:49 -0400)]
Settings: Remove fixed dropdown width from "From" pref.
Bug:
17457729
Change-Id: I99d294f43211765e410af53e87bb96b06715c0e3
PauloftheWest [Wed, 10 Sep 2014 21:43:11 +0000 (21:43 +0000)]
am
8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '
8b7d27cb78b09d9b2b2f4185308a042f471276ef':
Updated Bluetooth keyboard icon to teal.
PauloftheWest [Wed, 10 Sep 2014 21:35:15 +0000 (21:35 +0000)]
Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
PauloftheWest [Wed, 10 Sep 2014 17:29:19 +0000 (10:29 -0700)]
Made Bluetooth device dialog fully scrollable.
+ Also updated padding around Available Devices.
+ Also updated opacity on Bluetooth's "your device is visible" message.
Bug:
17398966
Change-Id: Id9631334ee0f3a01e40b00470d6debf6a31abe47
PauloftheWest [Wed, 10 Sep 2014 21:21:44 +0000 (14:21 -0700)]
Updated Bluetooth keyboard icon to teal.
Bug:
17140804
Change-Id: I59a4c0ff81b723ff4676b607e3da6cdc5c73625e
Jorim Jaggi [Tue, 9 Sep 2014 16:25:46 +0000 (18:25 +0200)]
Keep unlock attempt count after configuration change
Bug:
17416448
Change-Id: I79839a5e8020b184dd8928b47fc018d5209988ed
Jason Monk [Wed, 10 Sep 2014 20:43:01 +0000 (20:43 +0000)]
am
062f736c: Adding zen mode condition dialog
* commit '
062f736c8bfda9ac6ac7476ad51e52ca077f1505':
Adding zen mode condition dialog
Jason Monk [Mon, 8 Sep 2014 14:16:06 +0000 (10:16 -0400)]
Adding zen mode condition dialog
So that when you turn on priority or none in settings, you can
select the end condition.
Depends on framework changes: I9300af4f8b6d80042452b75db3418b20c5c5cc81
Bug:
15454830
Change-Id: I7856beabdd54de2ef10fa5c3d38bf27f36014693
Fabrice Di Meglio [Wed, 10 Sep 2014 20:19:55 +0000 (20:19 +0000)]
am
877fb7fb: Merge "Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '
877fb7fb425ed63f01a941718cea5fc263e74731':
Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
Fabrice Di Meglio [Wed, 10 Sep 2014 20:14:15 +0000 (20:14 +0000)]
Merge "Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
Fabrice Di Meglio [Wed, 10 Sep 2014 20:12:25 +0000 (13:12 -0700)]
Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
- add missing string
Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
Dan Sandler [Wed, 10 Sep 2014 13:54:28 +0000 (09:54 -0400)]
Show a better list of apps.
By using the new LauncherApps service we can make sure to
use the same filter that launchers do. (For example, many apps
don't set CATEGORY_DEFAULT on their front door activity.)
Bug:
17423134
Change-Id: I9538f306c9e2a8607b0c25b1a9a6ac3a7879a2c8
John Spurlock [Wed, 10 Sep 2014 17:06:33 +0000 (17:06 +0000)]
am
1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '
1e7dbd455eade6e6d8f1abd7969dd096972ed84f':
Settings: Use the same day sequence for downtime.
John Spurlock [Wed, 10 Sep 2014 17:06:32 +0000 (17:06 +0000)]
am
cddb2954: Settings: Make downtime days scrollable.
* commit '
cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
Settings: Make downtime days scrollable.
John Spurlock [Wed, 10 Sep 2014 15:38:30 +0000 (11:38 -0400)]
Settings: Use the same day sequence for downtime.
Make the starting day (Monday) the same between
the selection dialog and the summary text.
Bug:
17390052
Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362
John Spurlock [Wed, 10 Sep 2014 14:04:44 +0000 (10:04 -0400)]
Settings: Make downtime days scrollable.
Bug:
17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
Zoltan Szatmary-Ban [Wed, 10 Sep 2014 11:22:36 +0000 (12:22 +0100)]
Fixing Trusted Credentials Settings crash
List adapter's getCount method did not check for the case of uninitialised
data. This CL fixes that.
Bug:
17437943
Change-Id: I72d7f2c92aa380b1aaafe0658bd920017ff23906
Matthew Xie [Wed, 10 Sep 2014 00:56:06 +0000 (00:56 +0000)]
am
72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '
72e5583d2a9af10f2750e9abd23c3d5400e3c789':
Do not remove bonded devices from cached device list upon a device scan
Matthew Xie [Wed, 10 Sep 2014 00:48:40 +0000 (00:48 +0000)]
Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
Carlos Valdivia [Wed, 10 Sep 2014 00:24:44 +0000 (00:24 +0000)]
am
af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '
af85b740461b69d9b52d6d19a81d06f3a15b6507':
SECURITY: Prevent preference intents from exploiting settings.
Carlos Valdivia [Wed, 10 Sep 2014 00:16:15 +0000 (00:16 +0000)]
Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
Elliott Hughes [Wed, 10 Sep 2014 00:15:29 +0000 (00:15 +0000)]
am
a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '
a6e57b88ffa2af3014a3f689e3d08c7b77c9a64d':
Always use the LocalePicker's preferred locale names.
Jorim Jaggi [Wed, 10 Sep 2014 00:15:00 +0000 (00:15 +0000)]
am
b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '
b2bea36bb51af63a5e65cedbf49c3ccdd5a7507c':
Fix layout issues with landscape pattern/password layouts
Matthew Xie [Tue, 9 Sep 2014 05:30:18 +0000 (22:30 -0700)]
Do not remove bonded devices from cached device list upon a device scan
Bug:
17405122
Change-Id: I3f5cc6ddc8f85d3b6223f9ff60e1d5eeb76c530a
Elliott Hughes [Tue, 9 Sep 2014 21:49:39 +0000 (21:49 +0000)]
Merge "Always use the LocalePicker's preferred locale names." into lmp-dev
Elliott Hughes [Tue, 9 Sep 2014 21:33:11 +0000 (14:33 -0700)]
Always use the LocalePicker's preferred locale names.
Without this change we have the odd situation where LocalePicker goes out of
its way to avoid saying certain things but then -- as long as there's more than
one locale for a given language -- Settings would happily report the name we'd
been avoiding. (Either because it's too specific or because it's too sensitive.)
Also remove the unused bit-rotted duplicate of the blacklist; even if we needed
to access that list directly, we should use LocalePicker's copy.
Bug:
17150708
Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
Jorim Jaggi [Tue, 9 Sep 2014 21:18:38 +0000 (21:18 +0000)]
Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
Jorim Jaggi [Tue, 9 Sep 2014 16:25:46 +0000 (18:25 +0200)]
Fix layout issues with landscape pattern/password layouts
Bug:
17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
PauloftheWest [Tue, 9 Sep 2014 20:52:13 +0000 (20:52 +0000)]
am
654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '
654517a510dd4f655a468ad0083d04929338a7df':
Fixed a Null Pointer Error in Bluetooth Settings.
PauloftheWest [Tue, 9 Sep 2014 20:45:59 +0000 (20:45 +0000)]
Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
Amith Yamasani [Tue, 9 Sep 2014 20:38:36 +0000 (20:38 +0000)]
am
67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '
6707999600129286ad362bfc2974e321ff06ec90':
Handle disallowed NFC beam restriction
Adam Lesinski [Tue, 9 Sep 2014 20:38:35 +0000 (20:38 +0000)]
am
3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '
3649045d109090f8e5951414179fa87dd68ed519':
Make UsageAccess WarningDialog actually instatiatable.
Amith Yamasani [Tue, 9 Sep 2014 20:30:35 +0000 (20:30 +0000)]
Merge "Handle disallowed NFC beam restriction" into lmp-dev
Adam Lesinski [Tue, 9 Sep 2014 20:30:11 +0000 (20:30 +0000)]
Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
Amith Yamasani [Tue, 9 Sep 2014 19:07:11 +0000 (12:07 -0700)]
Handle disallowed NFC beam restriction
Don't enable the beam setting and toggle if it is disallowed for
the current user.
Bug:
17387303
Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
PauloftheWest [Tue, 9 Sep 2014 18:53:59 +0000 (18:53 +0000)]
am
29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '
29a9c6844b04415505a9a3e9212f85432492702e':
Removed connect button from Saved Networks dialog.
Adam Lesinski [Tue, 9 Sep 2014 18:34:55 +0000 (11:34 -0700)]
Make UsageAccess WarningDialog actually instatiatable.
The DialogFragment used for WarningDialog was not instatiatable
by the fragment manager.
Bug:
17435234
Change-Id: I5f65dd1e0ec0b95d048934480bd5fafd8648ab7c
Carlos Valdivia [Tue, 9 Sep 2014 03:12:24 +0000 (20:12 -0700)]
SECURITY: Prevent preference intents from exploiting settings.
Settings has super powers because it shares the system uid. We prevent
those powers from being exploited by malicious authenticators by
checking the intents those authenticators provide.
We will only launch intents that resolve to Activities that are exported=true
or owned by the same UID as the authenticator.
Bug:
14408627
Change-Id: Ia179df8561d29745767dac0f3c97eb0f68083f59
PauloftheWest [Tue, 9 Sep 2014 18:00:49 +0000 (18:00 +0000)]
Merge "Removed connect button from Saved Networks dialog." into lmp-dev
PauloftheWest [Tue, 9 Sep 2014 17:04:46 +0000 (10:04 -0700)]
Fixed a Null Pointer Error in Bluetooth Settings.
+ The root of the problem is that the callback for a device change may be
set before the fragment has a layout. Then if a change does come in,
getView() would return null. This fix delays registering the callback
until appropiate.
Bug:
17404518
Change-Id: Ibd0e90f82593d45729f427bcc2e40fe9195eb42a
Zoltan Szatmary-Ban [Tue, 9 Sep 2014 11:12:27 +0000 (11:12 +0000)]
am
574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '
574db4269528c7277f6e14a44156909fdb063190':
Update Trusted Credentials screen in settings
Zoltan Szatmary-Ban [Tue, 9 Sep 2014 11:05:54 +0000 (11:05 +0000)]
Merge "Update Trusted Credentials screen in settings" into lmp-dev
Baligh Uddin [Tue, 9 Sep 2014 05:43:25 +0000 (22:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20034afe71fda554c3139ad8e56df1fa7ae1ffd4
Auto-generated-cl: translation import
Elliott Hughes [Mon, 8 Sep 2014 23:40:42 +0000 (23:40 +0000)]
am
5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '
5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
Start cleaning up percentage formatting in Settings.
Elliott Hughes [Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)]
Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
PauloftheWest [Fri, 5 Sep 2014 13:54:39 +0000 (06:54 -0700)]
Removed connect button from Saved Networks dialog.
Bug:
17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
PauloftheWest [Mon, 8 Sep 2014 22:54:05 +0000 (22:54 +0000)]
am
bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '
bec89d797b6f2680c544639faed7e47573625e11':
Fixed scrolling on the Wi-Fi Settings Dialog.
PauloftheWest [Mon, 8 Sep 2014 22:34:50 +0000 (22:34 +0000)]
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 22:08:41 +0000 (22:08 +0000)]
am
e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '
e5f847357697f15fe0507b9c9a77e85f2c0aeedf':
Disabled SIM Cards in Settings.
PauloftheWest [Mon, 8 Sep 2014 22:08:40 +0000 (22:08 +0000)]
am
d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '
d0db988bb635975a366654099fe1ac559283161f':
Material theme updates for Wifi Dialog.
PauloftheWest [Mon, 8 Sep 2014 22:02:11 +0000 (22:02 +0000)]
Merge "Disabled SIM Cards in Settings." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 22:01:06 +0000 (22:01 +0000)]
Merge "Material theme updates for Wifi Dialog." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 21:52:37 +0000 (14:52 -0700)]
Fixed scrolling on the Wi-Fi Settings Dialog.
+ When needed, scrollbars will always appear on the Wi-Fi Settings Dialog.
Bug:
17166502
Change-Id: I7f61746b505d1a1476e987571dc757d01ce636df
PauloftheWest [Fri, 5 Sep 2014 20:52:26 +0000 (13:52 -0700)]
Material theme updates for Wifi Dialog.
Bug:
17014192
Change-Id: I1e5dd04199a433d8d1c5c4e4c48329e871e28db5
Andres Morales [Mon, 8 Sep 2014 21:19:29 +0000 (21:19 +0000)]
am
4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit '
4fc50daefa205c6a511459c2978c288df31dd505':
Fix issue where can't FR Volantis if OEM unlock is enabled
PauloftheWest [Mon, 8 Sep 2014 18:08:41 +0000 (11:08 -0700)]
Disabled SIM Cards in Settings.
+ Multi-SIM has been punted out from the L release. This change disables
the SIM Cards UI while keeping the code base.
Bug:
16808006
Change-Id: I2bd7ad430a6309f3f2241cd26ec86268aa31b699
Andres Morales [Mon, 8 Sep 2014 21:07:48 +0000 (21:07 +0000)]
Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 21:05:32 +0000 (21:05 +0000)]
am
5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '
5fe30ea841d0512c414059c814a0d1e0590b7eeb':
Turning Bluetooth on will make the device discoverable.
PauloftheWest [Mon, 8 Sep 2014 21:00:11 +0000 (21:00 +0000)]
Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 21:45:40 +0000 (14:45 -0700)]
Turning Bluetooth on will make the device discoverable.
Bug:
17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
Andres Morales [Mon, 8 Sep 2014 20:14:00 +0000 (13:14 -0700)]
Fix issue where can't FR Volantis if OEM unlock is enabled
Bug:
17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
Alan Viverette [Mon, 8 Sep 2014 19:57:07 +0000 (19:57 +0000)]
am
01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '
01f3a15e89f80d88ba8600a53f5722468fecd4c9':
Use correct list index for search highlighting
Alan Viverette [Mon, 8 Sep 2014 19:47:53 +0000 (19:47 +0000)]
Merge "Use correct list index for search highlighting" into lmp-dev
Alan Viverette [Mon, 8 Sep 2014 19:40:59 +0000 (12:40 -0700)]
Use correct list index for search highlighting
BUG:
14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
vandwalle [Mon, 8 Sep 2014 19:32:26 +0000 (19:32 +0000)]
am
c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '
c187193c19cb8ad617ae85b81cb19a4d7d8fe16a':
prettify the wifi verbose logging string
vandwalle [Mon, 8 Sep 2014 19:22:39 +0000 (19:22 +0000)]
Merge "prettify the wifi verbose logging string" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 19:21:16 +0000 (19:21 +0000)]
am
edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit '
edbfedf58fe2cb636017cc6d16da654525a4362f':
Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
Alexandra Gherghina [Mon, 8 Sep 2014 19:13:09 +0000 (19:13 +0000)]
Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev
Carlos Valdivia [Mon, 8 Sep 2014 18:28:38 +0000 (18:28 +0000)]
am
690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit '
690ce1b32546c899fcf07f9d6552b04bb6fb7b2e':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Mon, 8 Sep 2014 18:21:03 +0000 (18:21 +0000)]
Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev
Jim Miller [Mon, 8 Sep 2014 09:14:53 +0000 (09:14 +0000)]
am
1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '
1f389c1996d754142c52c947105af4ec2db84f5c':
Fix problem where rotating the device doesn't launch TrustAgent pref
Alexandra Gherghina [Mon, 8 Sep 2014 09:14:52 +0000 (09:14 +0000)]
am
80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit '
80cd373263cf5fef41ad6a99317ecdcd68594734':
Reset Settings task when using the user switcher
Alexandra Gherghina [Mon, 8 Sep 2014 09:14:51 +0000 (09:14 +0000)]
am
dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '
dc3193ca6364ac9215180d2adb02f5ab009abe00':
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Jim Miller [Mon, 8 Sep 2014 08:26:14 +0000 (08:26 +0000)]
Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:04:43 +0000 (08:04 +0000)]
Merge "Reset Settings task when using the user switcher" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:03:38 +0000 (08:03 +0000)]
Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
vandwalle [Fri, 5 Sep 2014 07:00:24 +0000 (00:00 -0700)]
prettify the wifi verbose logging string
Bug:
15168065
Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug:
17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
Amith Yamasani [Sun, 7 Sep 2014 23:05:42 +0000 (23:05 +0000)]
am
30c50b15: Use correct API for badging
* commit '
30c50b15d0d716567c71d590aa835dc4a27591d6':
Use correct API for badging
Amith Yamasani [Sun, 7 Sep 2014 22:38:09 +0000 (15:38 -0700)]
Use correct API for badging
Bug:
17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
Jim Miller [Sat, 6 Sep 2014 01:48:18 +0000 (18:48 -0700)]
Fix problem where rotating the device doesn't launch TrustAgent pref
This fixes a bug where the TrustAgent intent was being lost when
the device configurtion changes. It used to depend on a view that
gets recreated. Instead, we persist the actual launch intent
which works across activity restarts.
Fixes bug
17040470
Change-Id: Ia1c93867254cfdc27683a767cf41fe74dbb97db0
Fabrice Di Meglio [Fri, 5 Sep 2014 21:20:03 +0000 (21:20 +0000)]
am
b5cc0134: Merge "Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
* commit '
b5cc01342ea3930ae3bc7592e13c4b5f6f4c646d':
Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard
Fabrice Di Meglio [Fri, 5 Sep 2014 21:12:51 +0000 (21:12 +0000)]
Merge "Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
OSDN Git Service
