OSDN Git Service
Prem Kumar [Mon, 15 Sep 2014 00:30:42 +0000 (00:30 +0000)]
am
07e5ea99: am
319e7a27: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
07e5ea995b5fdbb24b9d53a93db7f19220308ce2':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Mon, 15 Sep 2014 00:15:41 +0000 (00:15 +0000)]
am
319e7a27: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
319e7a27c89afc5e1da54e7a3b33943e89e79211':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Mon, 15 Sep 2014 00:00:25 +0000 (00:00 +0000)]
am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
c0deb7dac00b4fcbc64866042788e3247474538e':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Sun, 14 Sep 2014 23:51:21 +0000 (23:51 +0000)]
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 21:38:50 +0000 (21:38 +0000)]
am
be0827dd: am
f97ec546: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
be0827ddf3c0c54b4810ea98f58fd9af29a07461':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 21:17:53 +0000 (21:17 +0000)]
am
f97ec546: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
f97ec5468407fa6ce66ddb9f72022867c50e72cd':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 21:04:52 +0000 (21:04 +0000)]
am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
2e205e9b4b16133b29efba91e67bee8f20a51a88':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 19:36:18 +0000 (19:36 +0000)]
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 15:20:37 +0000 (11:20 -0400)]
Settings: Use new PowerManager call to set low power mode.
Bind the master switch to the power manager state instead
of directly to the single setting.
Depends on frameworks/base change:
Ic030504c9cad9868a7137abbe837b170da37852b
Bug:
17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
Tyler Gunn [Sat, 13 Sep 2014 20:46:44 +0000 (20:46 +0000)]
am
8bad5a2d: am
86e452f9: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
8bad5a2d0d972ab87a1d59539e25504de1b679c4':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 20:28:52 +0000 (20:28 +0000)]
am
86e452f9: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
86e452f9577e37dfae4f7160a28448b66084e5d9':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 20:12:59 +0000 (20:12 +0000)]
am
3e71b197: Renaming Telecomm to Telecom.
* commit '
3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
Paul Lawrence [Sat, 13 Sep 2014 03:58:49 +0000 (03:58 +0000)]
am
db51c76a: am
7f4c4fb5: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
db51c76a4ce7c0d7690444380f3dce7100336c11':
Prevent PIN/Passwword disappearing during boot
Kenny Guy [Sat, 13 Sep 2014 03:42:02 +0000 (03:42 +0000)]
am
28d2fa62: am
1ede808c: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
28d2fa6215acd25f362f512103b8659420b6ee52':
Fix crash when showing accounts.
Tyler Gunn [Wed, 10 Sep 2014 22:21:33 +0000 (15:21 -0700)]
Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug:
17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
Alexandra Gherghina [Fri, 12 Sep 2014 23:10:08 +0000 (23:10 +0000)]
am
cd321d81: am
69af2c6a: am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
cd321d81f72cc9ef20b2d62d40589593588ee353':
Switch to using system-wide default user icons
PauloftheWest [Fri, 12 Sep 2014 23:10:03 +0000 (23:10 +0000)]
am
6c1d69ba: am
9f96ac6f: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
6c1d69ba452db01af820243f6ff917b7f85c6d19':
Fixed multiple Bluetooth Settings crashes.
Dianne Hackborn [Fri, 12 Sep 2014 23:05:48 +0000 (23:05 +0000)]
am
c857cddf: am
364ca371: am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
c857cddf899588efc2d65dcc34ba448ababab594':
Fix some things in settings: manage apps, battery, procstats
Svetoslav [Fri, 12 Sep 2014 23:05:47 +0000 (23:05 +0000)]
am
c33aef20: am
c50841ca: am
85dcef12: Fix settings crash in print job screen.
* commit '
c33aef207ec1536157acd1a0bd1b03c51de7a9a9':
Fix settings crash in print job screen.
Vinit Deshpande [Fri, 12 Sep 2014 23:05:46 +0000 (23:05 +0000)]
am
7aaccec0: am
c471629c: am
0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
7aaccec09c269d0fe680bbe5eea344d0366cd5eb':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
Svetoslav [Fri, 12 Sep 2014 23:05:45 +0000 (23:05 +0000)]
am
536cb798: am
842e9d04: am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
536cb798f35ad1ce86699eb1bac0ba0a895c011f':
Fix print icons in settings.
Carlos Valdivia [Fri, 12 Sep 2014 23:05:44 +0000 (23:05 +0000)]
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 '
456fbe88d05c933e54c3c73e20d3a48edf2eee06':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Baligh Uddin [Fri, 12 Sep 2014 23:05:43 +0000 (23:05 +0000)]
am
f053f532: (-s ours) am
a2e918af: (-s ours) am
9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f053f532cedfeb846b893f754d96f95647b9bd5f':
Import translations. DO NOT MERGE
Dan Sandler [Fri, 12 Sep 2014 23:05:42 +0000 (23:05 +0000)]
am
99e467a7: am
e98bee54: am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
99e467a75e7e2e671368817ea0f2a1efe50a373e':
Show a better list of apps.
Zoltan Szatmary-Ban [Fri, 12 Sep 2014 23:05:41 +0000 (23:05 +0000)]
am
118cf516: am
55cd479d: am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
118cf516c22b86e501029529cd110c9c9e20dcf9':
Check for DeviceAdminInfo type before casting
Zoltan Szatmary-Ban [Fri, 12 Sep 2014 23:05:39 +0000 (23:05 +0000)]
am
b2259b3a: am
b46eeeb7: am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
b2259b3a55f462517fa6d8a3e58d07433da19087':
Fixing Trusted Credentials Settings crash
Fabrice Di Meglio [Fri, 12 Sep 2014 23:05:38 +0000 (23:05 +0000)]
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 '
a2bba88bc857100afc9342535c3aa4284fab5858':
Fix bug #
17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
PauloftheWest [Fri, 12 Sep 2014 23:05:37 +0000 (23:05 +0000)]
am
c1806600: am
23d0ac44: am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
c1806600c426236a0ff028f67ca410fac98af020':
Added bluetooth_device_settings_header to fix build breakage.
Jim Miller [Fri, 12 Sep 2014 23:05:36 +0000 (23:05 +0000)]
am
825eb63c: am
f496ae94: am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
825eb63c1b26b2906ebfb680e386ebfebebec0f6':
Keep unlock attempt count after configuration change
Baligh Uddin [Fri, 12 Sep 2014 23:05:35 +0000 (23:05 +0000)]
am
6f96fcc5: (-s ours) am
321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
6f96fcc5a3fe4530e332935ade3cf061e13b9f24':
Import translations. DO NOT MERGE
Paul Lawrence [Fri, 12 Sep 2014 22:25:36 +0000 (22:25 +0000)]
am
7f4c4fb5: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
7f4c4fb5b6e05eb5affe5f64381e0b5374c869db':
Prevent PIN/Passwword disappearing during boot
Paul Lawrence [Fri, 12 Sep 2014 22:05:33 +0000 (22:05 +0000)]
am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
Prevent PIN/Passwword disappearing during boot
Paul Lawrence [Fri, 12 Sep 2014 21:44:48 +0000 (21:44 +0000)]
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 20:03:01 +0000 (20:03 +0000)]
am
1ede808c: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
1ede808c61bd0a9c420ca2eb532cbbc31881cad5':
Fix crash when showing accounts.
Kenny Guy [Fri, 12 Sep 2014 19:37:22 +0000 (19:37 +0000)]
am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
Paul Lawrence [Wed, 14 May 2014 20:57:06 +0000 (13:57 -0700)]
Prevent PIN/Passwword disappearing during boot
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.
Ignore this change since it is immaterial to what we display.
Bug:
17421115
Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
Kenny Guy [Fri, 12 Sep 2014 19:17:09 +0000 (19:17 +0000)]
Merge "Fix crash when showing accounts." into lmp-dev
Alexandra Gherghina [Fri, 12 Sep 2014 18:56:26 +0000 (18:56 +0000)]
am
69af2c6a: am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
69af2c6adc6adea77254c4709ac0c7d1ae9e8d00':
Switch to using system-wide default user icons
PauloftheWest [Fri, 12 Sep 2014 18:56:25 +0000 (18:56 +0000)]
am
9f96ac6f: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
9f96ac6f737d10d7b881d66053a862fa698f87dc':
Fixed multiple Bluetooth Settings crashes.
Kenny Guy [Fri, 12 Sep 2014 18:49:11 +0000 (19:49 +0100)]
Fix crash when showing accounts.
Accounts page crashed when showing a disabled
manged profile.
Bug:
17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
Alexandra Gherghina [Fri, 12 Sep 2014 17:27:25 +0000 (17:27 +0000)]
am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
PauloftheWest [Fri, 12 Sep 2014 17:27:25 +0000 (17:27 +0000)]
am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
Alexandra Gherghina [Fri, 12 Sep 2014 16:03:52 +0000 (16:03 +0000)]
Merge "Switch to using system-wide default user icons" into lmp-dev
Alexandra Gherghina [Wed, 3 Sep 2014 09:22:09 +0000 (10:22 +0100)]
Switch to using system-wide default user icons
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.
Bug:
17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
Dianne Hackborn [Fri, 12 Sep 2014 13:59:18 +0000 (13:59 +0000)]
am
364ca371: am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
364ca371a38b1f844f1f1e614133f0592fe04001':
Fix some things in settings: manage apps, battery, procstats
Svetoslav [Fri, 12 Sep 2014 13:59:18 +0000 (13:59 +0000)]
am
c50841ca: am
85dcef12: Fix settings crash in print job screen.
* commit '
c50841caa924f6c3af92c10d377b336e6cc6641d':
Fix settings crash in print job screen.
Vinit Deshpande [Fri, 12 Sep 2014 13:59:17 +0000 (13:59 +0000)]
am
c471629c: am
0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
c471629c7d98403be92a1cb30f04612a9d12b7bc':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
Svetoslav [Fri, 12 Sep 2014 13:59:16 +0000 (13:59 +0000)]
am
842e9d04: am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
842e9d04ade970409f930686d875644e3d827e19':
Fix print icons in settings.
Carlos Valdivia [Fri, 12 Sep 2014 13:59:15 +0000 (13:59 +0000)]
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.
Baligh Uddin [Fri, 12 Sep 2014 13:59:14 +0000 (13:59 +0000)]
am
a2e918af: (-s ours) am
9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a2e918af43fc011e49c39187e55e0707789438b9':
Import translations. DO NOT MERGE
Dan Sandler [Fri, 12 Sep 2014 13:59:13 +0000 (13:59 +0000)]
am
e98bee54: am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
e98bee54be5b8ca17e5860d34bac9d56116777d9':
Show a better list of apps.
Zoltan Szatmary-Ban [Fri, 12 Sep 2014 13:59:12 +0000 (13:59 +0000)]
am
55cd479d: am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
55cd479d5511d9806a129cc4b40be7df79955197':
Check for DeviceAdminInfo type before casting
Zoltan Szatmary-Ban [Fri, 12 Sep 2014 13:59:11 +0000 (13:59 +0000)]
am
b46eeeb7: am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
b46eeeb7be7dbf7b791c0527e096771032112321':
Fixing Trusted Credentials Settings crash
Fabrice Di Meglio [Fri, 12 Sep 2014 13:59:10 +0000 (13:59 +0000)]
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
PauloftheWest [Fri, 12 Sep 2014 13:59:09 +0000 (13:59 +0000)]
am
23d0ac44: am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
23d0ac449119cb30de08d03fb38f92e87c9009ed':
Added bluetooth_device_settings_header to fix build breakage.
Jim Miller [Fri, 12 Sep 2014 13:59:09 +0000 (13:59 +0000)]
am
f496ae94: am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
f496ae94138e44d623819afdc4d0893acb27f3fc':
Keep unlock attempt count after configuration change
Baligh Uddin [Fri, 12 Sep 2014 13:59:08 +0000 (13:59 +0000)]
am
321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
321b25a1443b71316462ad0fea675f539501d8f0':
Import translations. DO NOT MERGE
PauloftheWest [Fri, 12 Sep 2014 13:06:41 +0000 (13:06 +0000)]
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 07:28:47 +0000 (07:28 +0000)]
am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
a5780340fcf8f8910f1aa1197c604be32ff6a5cf':
Fix some things in settings: manage apps, battery, procstats
Svetoslav [Fri, 12 Sep 2014 07:24:46 +0000 (07:24 +0000)]
am
85dcef12: Fix settings crash in print job screen.
* commit '
85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
Dianne Hackborn [Fri, 12 Sep 2014 02:24:16 +0000 (02:24 +0000)]
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 01:09:29 +0000 (18:09 -0700)]
Fix some things in settings: manage apps, battery, procstats
Issue #
17461567: java.lang.ArithmeticException: divide by zero when
looking at Settings > Battery
Yeah, let's not do that.
Issue #
17365562: Running services RAM totals are wrong
Okay so like a few months ago, I had this vacation coming up, and
it was around the feature complete (hahah) deadline, and I had to
rush to get this in before I left. So I rushed. And, well, I forgot
a few things. Here they are. We now show the right numbers and
even update things correctly when you change what processes are
being shown. Wow.
Finally, fixed a few issues in the dev tools procstats UI.
Change-Id: I8348a9c2ec3226a455c5c8465729e4487f324c8b
Svetoslav [Thu, 11 Sep 2014 21:30:13 +0000 (14:30 -0700)]
Fix settings crash in print job screen.
The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.
bug:
17471952
Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0
PauloftheWest [Wed, 10 Sep 2014 13:45:00 +0000 (06:45 -0700)]
Fixed multiple Bluetooth Settings crashes.
+ Fixed a crash when selecting On/Off multiple times on an input device.
+ Fixed a crash when visiting different Bluetooth Settings after
disabling an input device.
Bug:
17402421
Change-Id: I23efa3a36ba8cf0df02cf41397586a10dae9e08c
Vinit Deshpande [Thu, 11 Sep 2014 18:25:46 +0000 (18:25 +0000)]
am
0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
Vinit Deshpande [Thu, 11 Sep 2014 18:16:59 +0000 (18:16 +0000)]
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
Svetoslav [Thu, 11 Sep 2014 17:39:26 +0000 (17:39 +0000)]
am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
Carlos Valdivia [Thu, 11 Sep 2014 17:39:25 +0000 (17:39 +0000)]
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.
Svetoslav [Thu, 11 Sep 2014 17:28:30 +0000 (17:28 +0000)]
Merge "Fix print icons in settings." into lmp-dev
Carlos Valdivia [Thu, 11 Sep 2014 17:25:05 +0000 (17:25 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 17:12:11 +0000 (17:12 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
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.
Baligh Uddin [Thu, 11 Sep 2014 16:11:13 +0000 (16:11 +0000)]
am
9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
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:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
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
Vinit Deshpande [Thu, 11 Sep 2014 01:38:26 +0000 (18:38 -0700)]
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
This change removes requirement that sender has this permission for
protected broadcasts (since they can only come from framework)
Bug:
17409667
Change-Id: I3431c20a4ed28b3ba2bfc3cf53772e63a3424a2c
Svetoslav [Thu, 11 Sep 2014 01:33:25 +0000 (18:33 -0700)]
Fix print icons in settings.
The print icons are in the framework resources and are not tinted
to enable usage from various places such as print spooler and
settings with different tinting. Settings was using not-tinted
print icons which were invisible on the white background. This
change switches settings to user tinted drawables.
bug:
16966145
Change-Id: I2cf55d36d90b0192ba23686aac4f1d8e7e23f75a
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
OSDN Git Service
