Amit Mahajan
6d042a69aa
am 1704ca96
: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
...
* commit '1704ca968d4566218f159817625f849c1dc34d96':
Change to add user_visible field to Carriers table.
2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
2015-10-14 23:33:01 +00:00
Erik Kline
51d71aa2bf
am 583deb52
: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
...
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:42:15 +00:00
Lorenzo Colitti
c311c94af5
Unconfigure the lockdown VPN if the user forgets its profile.
...
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.
Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.
Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
2015-10-13 15:23:38 +09:00
Christopher Tate
78f7fa0fc8
am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
2015-10-09 23:57:48 +00:00
Christopher Tate
90de3bebf4
Disable app-link preferences for browser apps
...
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug 23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
2015-10-09 16:02:00 -07:00
Amit Mahajan
5787be339f
Change to add user_visible field to Carriers table.
...
Also adding config to control if adding APNs is allowed.
Bug: 24519879
Bug: 24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
2015-10-08 10:36:03 -07:00
Zach Kuznia
a8f3f067b6
am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit 'ae8aea76e5cbef1eefde401f8622d05275156cf7':
Allow manual to be read from disk
2015-10-01 00:15:52 +00:00
Zach Kuznia
ae8aea76e5
Merge "Allow manual to be read from disk" into mnc-dr-dev
2015-10-01 00:08:05 +00:00
Maurice Lam
2fd785e099
am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '655ddae8b52191633f0052617feb511b0bc02945':
[Fingerprint] Fix link accessibility
2015-09-25 01:01:57 +00:00
Maurice Lam
655ddae8b5
[Fingerprint] Fix link accessibility
...
Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView
from setup wizard and switched fingerprint_settings_footer to use
LinkTextView, so that users can navigate to the link in TalkBack
mode.
Bug: 24343933
Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
2015-09-24 16:28:27 -07:00
Jason Monk
3b06fd8b9d
am 16a8e8d1
: Make picture color mode less of a feature
...
* commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
Make picture color mode less of a feature
2015-09-23 20:44:16 +00:00
Jason Monk
16a8e8d102
Make picture color mode less of a feature
...
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
2015-09-23 16:08:13 -04:00
Jim Miller
71cfa2f794
am c5fa6e26
: Add a dummy string to help to add "fingerprint" to search
...
* commit 'c5fa6e26dffd43d8fab12117d7994d8ab6466048':
Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:04:51 +00:00
Jim Miller
c5fa6e26df
Add a dummy string to help to add "fingerprint" to search
...
Fixes bug 24172006
Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
2015-09-22 18:30:13 -07:00
Paul Lawrence
57ca15e45e
am 0f1e7bfe
: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit '0f1e7bfe19f2ca7598399712adaedf5acefcfb0b':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:41:22 +00:00
Paul Lawrence
0f1e7bfe19
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
...
This reverts commit 4f60679b76
.
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
2015-09-19 02:29:37 +00:00
Jim Miller
50ee327fb9
am d251fed3
: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
Add summary for 0 fingerprint settings preference
2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
2015-09-19 00:59:51 +00:00
Justin Harrison
a3add1d208
am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
Add color transform setting
2015-09-19 00:29:31 +00:00
Justin Harrison
c6a96d4076
Merge "Add color transform setting" into mnc-dr-dev
2015-09-19 00:21:45 +00:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jim Miller
d433359684
Add summary for 0 fingerprint settings preference
...
This allows the fingerprint summary to be shown when there
are no fingerprints.
Fixes bug 24172006
Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
2015-09-18 15:37:48 -07:00
Adam Lesinski
65477c800f
am 031bbef5
: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
Update implementation to match BatteryStats.Uid
2015-09-18 20:32:04 +00:00
Adam Lesinski
031bbef57e
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
2015-09-18 20:26:06 +00:00
Paul Lawrence
8d28491a2f
am c2e73bbc
: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit 'c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
2015-09-18 14:31:11 +00:00
Hyejin
7e84e35fb1
am 5565b5cd
: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '5565b5cd7537e9360e6382507a45cf5e091a5108':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:29:32 +00:00
Hyejin
5565b5cd75
Fix IndexOutOfBoundsException while silent provisioning check
...
- If hostpot off, we receive result through HotspotOffReceiver.
Sometimes, during provisioning, we're used to receive this.
In this case, we don't care.
After provisioning, we'll receive the intent again.
- In stress test,
index is sometimes invalid, equals to mCurrentTethers.size().
So, when provisioning, We check whether index is valid or not.
BUG=23528220
Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
2015-09-14 16:04:52 -07:00
Paul Lawrence
4f60679b76
Remove don't kill flag from CryptKeeper to stop logspam
...
Bug: 23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
2015-09-14 14:55:57 -07:00
Selim Cinek
fc76ddd01e
am cda53c5d
: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit 'cda53c5dc2c6a2c01dfd5db278a7899dd868da7d':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 00:38:18 +00:00
Selim Cinek
cda53c5dc2
Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
2015-09-12 00:28:09 +00:00
Selim Cinek
2547ea5b58
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
...
When rotating the ConfirmDeviceCredentials Activity, it was launched again after
solving the challenge.
Bug: 23937676
Change-Id: Ic0852448f498c79d5448c72cbc31bb55d9bfeddb
2015-09-11 17:22:22 -07:00
Jorim Jaggi
6f5bbc1b1e
am 5bd836aa
: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit '5bd836aac3b7602a4166bc836aaa33ccc7107d74':
Add timeout if we dont get onEnterAnimationComplete
2015-09-11 22:33:38 +00:00
Jorim Jaggi
c77839e0e1
am aee6e41e
: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit 'aee6e41e5188e8809d8439f05fdce311aa7171c8':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-11 22:33:37 +00:00
Jorim Jaggi
5bd836aac3
Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
2015-09-11 22:14:06 +00:00
Jorim Jaggi
aee6e41e51
Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
2015-09-11 22:13:21 +00:00
Jorim Jaggi
88957ef8ee
Add timeout if we dont get onEnterAnimationComplete
...
Window manager doesn't send us onEnterAnimationComplete in the case
where there are two activites starting at the same time and the
screen orientation is changing. Add a timeout to work around this
until we have a proper fix.
Bug: 23849216
Change-Id: I4be7787d1bc13f8cb0ffd892010c4b5c0142c783
2015-09-11 14:02:45 -07:00
Jorim Jaggi
74a2283d24
Finish trampoline activity for ConfirmDeviceCredential immediately
...
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.
Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
2015-09-10 20:14:06 -07:00
Jorim Jaggi
5628251b1b
am 5c49b5a4
: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
...
* commit '5c49b5a4b2cb1d90a02ce8610340db7020715de7':
Fix crash in when restoring CredentialCheckResultTracker Fragment
2015-09-11 02:09:36 +00:00
Jorim Jaggi
5c49b5a4b2
Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
2015-09-11 01:58:55 +00:00
Jason Monk
72fecf9f0a
am d3c60afe
: Include the usb data mode regardless of data role
...
* commit 'd3c60afe5267eb614b9c0a99b797e6bbb51de16f':
Include the usb data mode regardless of data role
2015-09-10 20:35:52 +00:00
Jorim Jaggi
69671dafc8
Fix crash in when restoring CredentialCheckResultTracker Fragment
...
Bug: 23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
2015-09-10 13:35:04 -07:00
Jason Monk
d3c60afe52
Include the usb data mode regardless of data role
...
Turns out there are valid data modes in host mode (like midi).
Need to allow these through for the dialog to set the proper
current state.
Bug: 23905770
Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
2015-09-10 10:38:14 -04:00
Jorim Jaggi
ef5f9e3952
am 48422b52
: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
Add double-tap power button to open camera 2/2
2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3
Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
2015-09-10 00:25:59 +00:00
Jim Miller
01f44efab0
am 179fa507
: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro
...
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:02:34 +00:00
Jim Miller
179fa5078b
Merge "Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev
2015-09-09 22:53:53 +00:00
Jorim Jaggi
cc1e9f7ce7
Add double-tap power button to open camera 2/2
...
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
2015-09-09 22:40:00 +00:00