Baligh Uddin
e4c1dccda9
am 6df1ad97
: (-s ours) am ba98cc2c
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '6df1ad97c906e936255a9feee6631b1684b0fa09':
Import translations. DO NOT MERGE
2015-09-15 14:27:34 +00:00
Baligh Uddin
6df1ad97c9
am ba98cc2c
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
2015-09-15 14:20:20 +00:00
Baligh Uddin
ba98cc2c14
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-15 14:12:42 +00:00
Hyejin
1dcb1135b8
am 7e84e35f
: am 5565b5cd
: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '7e84e35fb191c0967feb0352a39a3147ceb68a8b':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:37:16 +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
Baligh Uddin
6ea05b747d
Import translations. DO NOT MERGE
...
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
2015-09-14 03:20:45 -07:00
Selim Cinek
0fe43c9aec
am fc76ddd0
: am cda53c5d
: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit 'fc76ddd01e165e9641349cc721b294d62ce268e5':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 00:47:34 +00: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
d59ce1f4e3
am 6f5bbc1b
: am 5bd836aa
: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit '6f5bbc1b1e73b3559e311ea2e59a2281b67f65ca':
Add timeout if we dont get onEnterAnimationComplete
2015-09-11 23:22:17 +00:00
Jorim Jaggi
97081aa929
am c77839e0
: am aee6e41e
: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit 'c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-11 23:22:16 +00: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
Baligh Uddin
ad4de2fa60
am c5d18345
: (-s ours) am cdf00b16
: (-s ours) am 1538dde4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c5d183458c13a0d780aee93f256ea5dc6b22f815':
Import translations. DO NOT MERGE
2015-09-11 16:41:33 +00:00
Baligh Uddin
c5d183458c
am cdf00b16
: (-s ours) am 1538dde4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cdf00b1640bc621d513dcb965f44a4ace8bacece':
Import translations. DO NOT MERGE
2015-09-11 16:32:04 +00:00
Baligh Uddin
730a73daac
am cf80d7c4
: (-s ours) am 723c5b38
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'cf80d7c4f03f8c55963b4815c1b7004d77cb9e5b':
Import translations. DO NOT MERGE
2015-09-11 16:30:31 +00:00
Baligh Uddin
cf80d7c4f0
am 723c5b38
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '723c5b38b8fbd2db3a64b1ce782f8f760271ac98':
Import translations. DO NOT MERGE
2015-09-11 16:24:31 +00:00
Baligh Uddin
cdf00b1640
am 1538dde4
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1538dde4fbb00617bfd1d51f958f32ba4d68ff12':
Import translations. DO NOT MERGE
2015-09-11 16:24:21 +00:00
Baligh Uddin
723c5b38b8
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-11 16:19:17 +00: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
a4b5e202d5
am 5628251b
: am 5c49b5a4
: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
...
* commit '5628251b1bf051e73b6a8f1edd50b3e7447b06eb':
Fix crash in when restoring CredentialCheckResultTracker Fragment
2015-09-11 02:18:10 +00: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
Baligh Uddin
196555c71b
Import translations. DO NOT MERGE
...
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
2015-09-10 14:56:41 -07:00
Baligh Uddin
1538dde4fb
Import translations. DO NOT MERGE
...
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
2015-09-10 14:53:10 -07:00
Jason Monk
618bc11b0d
am 72fecf9f
: am d3c60afe
: Include the usb data mode regardless of data role
...
* commit '72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
Include the usb data mode regardless of data role
2015-09-10 20:41:37 +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
f37368db84
am ef5f9e39
: am 48422b52
: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit 'ef5f9e3952ac35df4ce4335be0020ae81b11f746':
Add double-tap power button to open camera 2/2
2015-09-10 01:02:39 +00: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
93b39ff9bd
am 01f44efa
: 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_TIMEO
...
* commit '01f44efab0673e8648470c8be1670730660a4778':
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:08:06 +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
Jim Miller
457904634c
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.
Fixes bug 23546104
Fixes bug 22708384
Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
2015-09-09 15:30:40 -07:00
Sungmin Choi
5fc624418c
am 9819dcb9
: am 9fcc7e1b
: Hide or show APNs with type="ims" as CarrierConfig
...
* commit '9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
Hide or show APNs with type="ims" as CarrierConfig
2015-09-09 18:06:25 +00:00
Sungmin Choi
9819dcb93e
am 9fcc7e1b
: Hide or show APNs with type="ims" as CarrierConfig
...
* commit '9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
Hide or show APNs with type="ims" as CarrierConfig
2015-09-09 17:58:29 +00:00
Sungmin Choi
9fcc7e1b20
Hide or show APNs with type="ims" as CarrierConfig
...
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.
Bug: 23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
2015-09-08 17:23:14 -07:00
Jorim Jaggi
c0c0bf3009
am 5cca5a5a
: am b83cbe20
: Fix build
...
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
Fix build
2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c
am b83cbe20
: Fix build
...
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
Fix build
2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b
Fix build
...
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
2015-09-08 21:42:17 +00:00
Jorim Jaggi
52aca96c0b
am 64ea62a3
: am 8c543276
: Fix crash in fingerprint settings when rotating
...
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
Fix crash in fingerprint settings when rotating
2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a
am 8c543276
: Fix crash in fingerprint settings when rotating
...
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
Fix crash in fingerprint settings when rotating
2015-09-08 21:17:06 +00:00