Carlos Valdivia
456fbe88d0
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 'a8627dd88e7632e452806a70b62c192111b30c57':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-12 13:59:15 +00:00
Baligh Uddin
f053f532ce
am a2e918af
: (-s ours) am 9b45212b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'a2e918af43fc011e49c39187e55e0707789438b9':
Import translations. DO NOT MERGE
2014-09-12 13:59:14 +00:00
Dan Sandler
99e467a75e
am e98bee54
: am 1fb51987
: Merge "Show a better list of apps." into lmp-dev
...
* commit 'e98bee54be5b8ca17e5860d34bac9d56116777d9':
Show a better list of apps.
2014-09-12 13:59:13 +00:00
Zoltan Szatmary-Ban
118cf516c2
am 55cd479d
: am cf911d10
: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit '55cd479d5511d9806a129cc4b40be7df79955197':
Check for DeviceAdminInfo type before casting
2014-09-12 13:59:12 +00:00
Zoltan Szatmary-Ban
b2259b3a55
am b46eeeb7
: am f572fdd1
: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'b46eeeb7be7dbf7b791c0527e096771032112321':
Fixing Trusted Credentials Settings crash
2014-09-12 13:59:11 +00:00
Fabrice Di Meglio
a2bba88bc8
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 'b88d24df0e0c804cf9c742411e4a6809ead3f020':
Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-12 13:59:10 +00:00
PauloftheWest
c1806600c4
am 23d0ac44
: am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit '23d0ac449119cb30de08d03fb38f92e87c9009ed':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-12 13:59:09 +00:00
Jim Miller
825eb63c1b
am f496ae94
: am ca03758e
: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit 'f496ae94138e44d623819afdc4d0893acb27f3fc':
Keep unlock attempt count after configuration change
2014-09-12 13:59:09 +00:00
Baligh Uddin
6f96fcc5a3
am 321b25a1
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '321b25a1443b71316462ad0fea675f539501d8f0':
Import translations. DO NOT MERGE
2014-09-12 13:59:08 +00:00
Carlos Valdivia
a8627dd88e
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 'f79797c8853741e80668f1d91c4d7d1a076bac18':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:39:25 +00:00
Carlos Valdivia
f79797c885
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 'ea2fa0d98a9777e37815624bf3e4345b4c6df643':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:25:05 +00:00
Carlos Valdivia
ea2fa0d98a
am db591467
: am 737d2d53
: am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'db591467f6ae0e082c0ce627874a851f1926d63a':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:12:11 +00:00
Carlos Valdivia
db591467f6
am 737d2d53
: am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:05:31 +00:00
Carlos Valdivia
737d2d538b
am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '61ced6d4270b86c336520856cb1545865cb01107':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:59:49 +00:00
Carlos Valdivia
61ced6d427
am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:49:32 +00:00
Carlos Valdivia
01137c2004
am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:42:54 +00:00
Carlos Valdivia
663b4e9733
am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:37:09 +00:00
Baligh Uddin
a2e918af43
am 9b45212b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
2014-09-11 16:11:13 +00:00
Dan Sandler
e98bee54be
am 1fb51987
: Merge "Show a better list of apps." into lmp-dev
...
* commit '1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
2014-09-11 16:01:27 +00:00
Zoltan Szatmary-Ban
55cd479d55
am cf911d10
: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
2014-09-11 16:01:24 +00:00
Zoltan Szatmary-Ban
b46eeeb7be
am f572fdd1
: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
2014-09-11 16:01:14 +00:00
Fabrice Di Meglio
b88d24df0e
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
2014-09-11 15:59:01 +00:00
PauloftheWest
23d0ac4491
am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 15:58:20 +00:00
Jim Miller
f496ae9413
am ca03758e
: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit 'ca03758ed6399d73c841bec8685ea1f19bf38fea':
Keep unlock attempt count after configuration change
2014-09-11 15:57:42 +00:00
Baligh Uddin
9b45212b1d
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-11 15:49:25 +00:00
Baligh Uddin
321b25a144
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-11 15:49:24 +00:00
Dan Sandler
1fb5198732
Merge "Show a better list of apps." into lmp-dev
2014-09-11 11:58:55 +00:00
Zoltan Szatmary-Ban
cf911d107a
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
2014-09-11 10:52:57 +00:00
Zoltan Szatmary-Ban
f572fdd132
Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
2014-09-11 09:23:55 +00:00
Fabrice Di Meglio
f8310c1850
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
2014-09-11 00:23:32 +00:00
Fabrice Di Meglio
2a8f7cb736
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
2014-09-10 17:20:17 -07:00
PauloftheWest
b2197d90a8
Added bluetooth_device_settings_header to fix build breakage.
...
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
2014-09-10 16:22:15 -07:00
PauloftheWest
52e1946554
am 1675c786
: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
...
* commit '1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
Made Bluetooth device dialog fully scrollable.
2014-09-10 22:20:37 +00:00
Jim Miller
ca03758ed6
Merge "Keep unlock attempt count after configuration change" into lmp-dev
2014-09-10 22:18:23 +00:00
PauloftheWest
1675c786bf
Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
2014-09-10 22:11:56 +00:00
John Spurlock
315e0a4a9e
am 31915522
: Settings: Remove fixed dropdown width from "From" pref.
...
* commit '31915522b764a097c5d660cb933d4acb5eb0fcb4':
Settings: Remove fixed dropdown width from "From" pref.
2014-09-10 22:06:09 +00:00
John Spurlock
31915522b7
Settings: Remove fixed dropdown width from "From" pref.
...
Bug:17457729
Change-Id: I99d294f43211765e410af53e87bb96b06715c0e3
2014-09-10 17:49:28 -04:00
PauloftheWest
4708092e4f
am 8b7d27cb
: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
...
* commit '8b7d27cb78b09d9b2b2f4185308a042f471276ef':
Updated Bluetooth keyboard icon to teal.
2014-09-10 21:43:11 +00:00
PauloftheWest
8b7d27cb78
Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
2014-09-10 21:35:15 +00:00
PauloftheWest
26747b9da0
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
2014-09-10 14:33:52 -07:00
PauloftheWest
85daf61bda
Updated Bluetooth keyboard icon to teal.
...
Bug: 17140804
Change-Id: I59a4c0ff81b723ff4676b607e3da6cdc5c73625e
2014-09-10 14:24:11 -07:00
Carlos Valdivia
37b58a420f
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
(cherry picked from commit f5d3e74ecc
)
2014-09-10 21:13:10 +00:00
Jorim Jaggi
0cb467afe1
Keep unlock attempt count after configuration change
...
Bug: 17416448
Change-Id: I79839a5e8020b184dd8928b47fc018d5209988ed
2014-09-10 14:12:41 -07:00
Jason Monk
c80014fbbb
am 062f736c
: Adding zen mode condition dialog
...
* commit '062f736c8bfda9ac6ac7476ad51e52ca077f1505':
Adding zen mode condition dialog
2014-09-10 20:43:01 +00:00
Jason Monk
062f736c8b
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
2014-09-10 20:32:39 +00:00
Fabrice Di Meglio
743400b466
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
2014-09-10 20:19:55 +00:00
Fabrice Di Meglio
877fb7fb42
Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
2014-09-10 20:14:15 +00:00
Fabrice Di Meglio
ade5761557
Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
...
- add missing string
Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
2014-09-10 13:12:25 -07:00
Dan Sandler
3d4b542d75
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
2014-09-10 18:10:12 +00:00
John Spurlock
417b826176
am 1e7dbd45
: Settings: Use the same day sequence for downtime.
...
* commit '1e7dbd455eade6e6d8f1abd7969dd096972ed84f':
Settings: Use the same day sequence for downtime.
2014-09-10 17:06:33 +00:00