Tyler Gunn
8bad5a2d0d
am 86e452f9
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '86e452f9577e37dfae4f7160a28448b66084e5d9':
Renaming Telecomm to Telecom.
2014-09-13 20:28:52 +00:00
Tyler Gunn
86e452f957
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 20:12:59 +00:00
Tyler Gunn
3e71b197f7
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
2014-09-12 20:22:25 -07:00
Paul Lawrence
db51c76a4c
am 7f4c4fb5
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit '7f4c4fb5b6e05eb5affe5f64381e0b5374c869db':
Prevent PIN/Passwword disappearing during boot
2014-09-12 22:25:36 +00:00
Paul Lawrence
7f4c4fb5b6
am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
Prevent PIN/Passwword disappearing during boot
2014-09-12 22:05:33 +00:00
Paul Lawrence
c64c9808b9
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
2014-09-12 21:44:48 +00:00
Kenny Guy
28d2fa6215
am 1ede808c
: am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit '1ede808c61bd0a9c420ca2eb532cbbc31881cad5':
Fix crash when showing accounts.
2014-09-12 20:03:01 +00:00
Kenny Guy
1ede808c61
am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
2014-09-12 19:37:22 +00:00
Paul Lawrence
5ab67c5648
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
2014-09-12 12:35:18 -07:00
Kenny Guy
db9e3f682f
Merge "Fix crash when showing accounts." into lmp-dev
2014-09-12 19:17:10 +00:00
Alexandra Gherghina
cd321d81f7
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
2014-09-12 18:56:26 +00:00
PauloftheWest
6c1d69ba45
am 9f96ac6f
: am 37b1253a
: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit '9f96ac6f737d10d7b881d66053a862fa698f87dc':
Fixed multiple Bluetooth Settings crashes.
2014-09-12 18:56:25 +00:00
Kenny Guy
7b72e2835b
Fix crash when showing accounts.
...
Accounts page crashed when showing a disabled
manged profile.
Bug: 17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
2014-09-12 19:49:11 +01:00
Alexandra Gherghina
69af2c6adc
am f738895d
: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
2014-09-12 17:27:25 +00:00
PauloftheWest
9f96ac6f73
am 37b1253a
: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
2014-09-12 17:27:25 +00:00
Alexandra Gherghina
f738895dc0
Merge "Switch to using system-wide default user icons" into lmp-dev
2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da
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
2014-09-12 17:00:40 +01:00
PauloftheWest
7e6e7acbf1
Updated Wi-Fi Settings icons to new filled-in teal format.
...
+ Added a filled-in teal Wi-Fi unlocked and locked icons.
+ Added a teal theme to Settings.
+ Updated Wi-Fi Settings and Setup Wizard to use the new teal format.
+ Updated the Settings icon (used in the Settings dashboard and in
search) to the new format.
Bug: 17331199
Change-Id: I0565ef6f2fa1be035c1bd150ea853cb976dc504c
2014-09-12 07:18:10 -07:00
Dianne Hackborn
c857cddf89
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
2014-09-12 13:59:18 +00:00
Svetoslav
c33aef207e
am c50841ca
: am 85dcef12
: Fix settings crash in print job screen.
...
* commit 'c50841caa924f6c3af92c10d377b336e6cc6641d':
Fix settings crash in print job screen.
2014-09-12 13:59:18 +00:00
Vinit Deshpande
7aaccec09c
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
2014-09-12 13:59:17 +00:00
Svetoslav
536cb798f3
am 842e9d04
: am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '842e9d04ade970409f930686d875644e3d827e19':
Fix print icons in settings.
2014-09-12 13:59:16 +00:00
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
PauloftheWest
37b1253a01
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
2014-09-12 13:06:42 +00:00
Dianne Hackborn
364ca371a3
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
2014-09-12 07:28:47 +00:00
Svetoslav
c50841caa9
am 85dcef12
: Fix settings crash in print job screen.
...
* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
2014-09-12 07:24:46 +00:00
Dianne Hackborn
a5780340fc
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
2014-09-12 02:24:17 +00:00
Dianne Hackborn
c891ce6565
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
2014-09-11 18:09:29 -07:00
Svetoslav
85dcef1226
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
2014-09-11 14:30:18 -07:00
PauloftheWest
8d6991348b
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
2014-09-11 12:36:58 -07:00
Vinit Deshpande
c471629c7d
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
2014-09-11 18:25:46 +00:00
Vinit Deshpande
0a11f60595
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
2014-09-11 18:17:00 +00:00
Svetoslav
842e9d04ad
am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:39:26 +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
Svetoslav
72cfbcb429
Merge "Fix print icons in settings." into lmp-dev
2014-09-11 17:28:32 +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