OSDN Git Service
Geoff Mendal [Mon, 5 Oct 2015 12:34:59 +0000 (12:34 +0000)]
am
82c61b2d: (-s ours) am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
82c61b2dd878eae9a30bd7953bf3e2390e1e5611':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)]
am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
010d2fcd2a4b8fda906ff0a0e04554475a45489c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:20:30 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
Zach Kuznia [Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)]
Merge "Allow manual to be read from disk" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 16:48:17 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:42:27 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)]
am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
0929be6613afbf01c313e94f019a0a3d30c9a0a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
dffcc532693c4bc6e07cf05ac532148612a94176':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
49b491bb7634284a8622e48c88571aa59ba59ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
2e095fa263b0887fc55576b32625264e13fee4c7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)]
am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
afc3831267c426974119608bb6c9179223532e47':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:27:22 +0000 (12:27 +0000)]
am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:21:29 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
Baligh Uddin [Sun, 27 Sep 2015 03:15:32 +0000 (03:15 +0000)]
am
23adae13: (-s ours) am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
23adae13328e88ac38b0448a4375dcb3264839e5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:10:00 +0000 (03:10 +0000)]
am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:09:13 +0000 (03:09 +0000)]
am
e50e0b49: (-s ours) am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
e50e0b49b51f4db840bd900c50df17bcb30664a4':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:04:11 +0000 (03:04 +0000)]
am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
2b802ceb328658fa18e007f859bda47a755dce30':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:03:44 +0000 (03:03 +0000)]
am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
ec9819828df47813168d99fd2905b98a230a5d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:57:14 +0000 (02:57 +0000)]
am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:56:45 +0000 (02:56 +0000)]
am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
9b9d77f163b65057540b37ac4f6732f01f2b2e40':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:53:00 +0000 (02:53 +0000)]
am
08516de0: (-s ours) am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
08516de0fe70780281bc817249fa6dce09b71889':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:50:43 +0000 (02:50 +0000)]
am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
15243a260c8accf0a1fc999282a10d1ecec334b6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:56 +0000 (02:49 +0000)]
am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
d0d54fc1c54a046eaf919978d584fa3528c36e24':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:12 +0000 (02:49 +0000)]
am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
ad7342ec09fb5a6fb28e84d0d93603f8d40ff225':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 21:44:41 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab766ad3ea1ff44ff2c30a8f9e6c95a03bebea62
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:23:31 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:14:23 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:05:09 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 02:58:35 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:50 +0000 (19:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dbabeae97d242d546a379cdd2cea75fceb8bec9
Auto-generated-cl: translation import
Maurice Lam [Thu, 24 Sep 2015 21:25:11 +0000 (14:25 -0700)]
[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
Jason Monk [Wed, 23 Sep 2015 20:08:13 +0000 (16:08 -0400)]
Make picture color mode less of a feature
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug:
24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
Baligh Uddin [Wed, 23 Sep 2015 05:02:21 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80
Auto-generated-cl: translation import
Jim Miller [Wed, 23 Sep 2015 01:30:13 +0000 (18:30 -0700)]
Add a dummy string to help to add "fingerprint" to search
Fixes bug
24172006
Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
Alex Klyubin [Tue, 22 Sep 2015 17:09:24 +0000 (17:09 +0000)]
Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
Zach Jang [Mon, 21 Sep 2015 21:37:15 +0000 (21:37 +0000)]
am
8fef0576: am
7b2994d2: (-s ours) am
1304f47c: am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
8fef0576518fa9baaf701e1da5564c2f6f2d9645':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:37:14 +0000 (21:37 +0000)]
am
2ead0934: am
386c7763: (-s ours) am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
2ead093496c3b5b266c21a483c4f0c37869d57de':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:30:07 +0000 (21:30 +0000)]
am
7b2994d2: (-s ours) am
1304f47c: am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
7b2994d2e87eafe84425666aba8f818e661a6fac':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:30:06 +0000 (21:30 +0000)]
am
386c7763: (-s ours) am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
386c7763eb8cd3e856a26fe3cbd39cc573978c29':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:06:16 +0000 (21:06 +0000)]
am
1304f47c: am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:06:13 +0000 (21:06 +0000)]
am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Alex Klyubin [Mon, 21 Sep 2015 19:02:46 +0000 (12:02 -0700)]
Fix MMS delivery issue by permitting HTTP from Settings app.
MMS delivery may fail on carriers which use cleartext HTTP for MMS,
due to an issue introduced in Android M. The cause is that the
platform-provided HTTP stack refuses cleartext HTTP from the MMS
service process because other packages (Settings app,
TelephonyProvider) loaded into the com.android.phone process declare
a policy that cleartext network traffic is not permitted. The issue
might be non-deterministic because the policy depends on the order in
which packages are loaded into the process.
From the perspective of platform-provided HTTP stacks, whether
cleartext HTTP traffic is permitted is a per-process setting. It is
set by the framework based on the policy of the package due to which
the process is started. Further packages loaded into the process do
not affect the per-process policy. This means all packages which may
be loaded into the same process must use the same cleartext network
traffic policy.
This fix relaxes the network security policy of the Settings app to
permit cleartext network traffic, so that all packages loaded into
the com.android.phone process uses the same policy.
Bug:
24222050
Change-Id: Id6d0018b30782c349963d92799d74266e5001729
Zach Jang [Mon, 21 Sep 2015 19:05:39 +0000 (19:05 +0000)]
am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
5cac896612ead73d08acb588e2f62512f8789cf4':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 19:05:36 +0000 (19:05 +0000)]
am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 18:58:23 +0000 (18:58 +0000)]
am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
8fc9b5b68494ac341b882623b1cbe124fd6256f8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 18:58:12 +0000 (18:58 +0000)]
am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Baligh Uddin [Sat, 19 Sep 2015 02:35:07 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Lawrence [Sat, 19 Sep 2015 02:32:23 +0000 (02:32 +0000)]
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
Paul Lawrence [Sat, 19 Sep 2015 02:29:37 +0000 (02:29 +0000)]
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
This reverts commit
4f60679b7608aba38142bfee472c4722aebf056f.
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
Jim Miller [Sat, 19 Sep 2015 00:59:51 +0000 (00:59 +0000)]
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:21:45 +0000 (00:21 +0000)]
Merge "Add color transform setting" into mnc-dr-dev
Jason Monk [Fri, 18 Sep 2015 20:16:52 +0000 (16:16 -0400)]
Add color transform setting
Bug:
24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
Jim Miller [Fri, 18 Sep 2015 21:59:54 +0000 (14:59 -0700)]
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
Adam Lesinski [Fri, 18 Sep 2015 20:26:06 +0000 (20:26 +0000)]
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
Baligh Uddin [Fri, 18 Sep 2015 17:37:08 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
Paul Lawrence [Fri, 18 Sep 2015 15:26:01 +0000 (15:26 +0000)]
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
Paul Lawrence [Fri, 18 Sep 2015 14:31:11 +0000 (14:31 +0000)]
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
Zach Jang [Thu, 17 Sep 2015 20:40:30 +0000 (20:40 +0000)]
am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
2e006b2b07c7c333c51fb9b447b8df6df66ba421':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:27:21 +0000 (20:27 +0000)]
am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
b7e865ee486ea255e0f76c4d0129d608a7e7995d':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:16:45 +0000 (20:16 +0000)]
am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:04:24 +0000 (20:04 +0000)]
am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
e7e0c03f003930461603ae71ec0ce815d5a7f40a':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)]
am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Paul Lawrence [Wed, 16 Sep 2015 22:29:57 +0000 (15:29 -0700)]
Stop long passwords crashing CryptKeeper
Bug:
24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
Baligh Uddin [Tue, 15 Sep 2015 14:12:42 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Hyejin [Fri, 11 Sep 2015 06:26:53 +0000 (23:26 -0700)]
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
Paul Lawrence [Mon, 14 Sep 2015 21:55:57 +0000 (14:55 -0700)]
Remove don't kill flag from CryptKeeper to stop logspam
Bug:
23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
Zach Jang [Mon, 14 Sep 2015 21:03:12 +0000 (14:03 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3
b/
23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
Baligh Uddin [Mon, 14 Sep 2015 10:20:45 +0000 (03:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
Zach Jang [Sat, 12 Sep 2015 00:37:48 +0000 (17:37 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3
b/
23946860
Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
Selim Cinek [Sat, 12 Sep 2015 00:28:09 +0000 (00:28 +0000)]
Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
Selim Cinek [Sat, 12 Sep 2015 00:06:29 +0000 (17:06 -0700)]
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
Jorim Jaggi [Fri, 11 Sep 2015 22:14:06 +0000 (22:14 +0000)]
Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 22:13:21 +0000 (22:13 +0000)]
Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 04:24:22 +0000 (21:24 -0700)]
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
Baligh Uddin [Fri, 11 Sep 2015 16:24:21 +0000 (16:24 +0000)]
am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
1538dde4fbb00617bfd1d51f958f32ba4d68ff12':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:19:17 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 03:12:19 +0000 (20:12 -0700)]
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
Jorim Jaggi [Fri, 11 Sep 2015 01:58:55 +0000 (01:58 +0000)]
Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
Baligh Uddin [Thu, 10 Sep 2015 21:56:41 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
Baligh Uddin [Thu, 10 Sep 2015 21:53:10 +0000 (14:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
Jorim Jaggi [Thu, 10 Sep 2015 20:35:04 +0000 (13:35 -0700)]
Fix crash in when restoring CredentialCheckResultTracker Fragment
Bug:
23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
Jason Monk [Thu, 10 Sep 2015 14:36:58 +0000 (10:36 -0400)]
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
Jorim Jaggi [Thu, 10 Sep 2015 00:25:59 +0000 (00:25 +0000)]
Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
Jim Miller [Wed, 9 Sep 2015 22:53:53 +0000 (22:53 +0000)]
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
Jorim Jaggi [Tue, 8 Sep 2015 21:56:40 +0000 (14:56 -0700)]
Add double-tap power button to open camera 2/2
Bug:
23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
Jim Miller [Wed, 2 Sep 2015 21:00:50 +0000 (14:00 -0700)]
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
Sungmin Choi [Fri, 28 Aug 2015 23:56:31 +0000 (16:56 -0700)]
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
Jorim Jaggi [Tue, 8 Sep 2015 21:40:27 +0000 (14:40 -0700)]
Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
Jorim Jaggi [Fri, 4 Sep 2015 18:42:28 +0000 (11:42 -0700)]
Fix crash in fingerprint settings when rotating
Fragments always need empty constructors.
Bug:
23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
Geoff Mendal [Mon, 7 Sep 2015 15:35:11 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
Adam Lesinski [Sun, 6 Sep 2015 08:57:58 +0000 (01:57 -0700)]
Update implementation to match BatteryStats.Uid
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
Jason Monk [Thu, 3 Sep 2015 17:51:09 +0000 (17:51 +0000)]
Merge "Start tether service with redeliver intent" into mnc-dr-dev
Jason Monk [Thu, 3 Sep 2015 16:48:25 +0000 (12:48 -0400)]
Start tether service with redeliver intent
So that the intent comes back when we are restarted rather than
null causing a crash.
Bug:
23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
Jorim Jaggi [Thu, 3 Sep 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Fix fingerprint settings ripples" into mnc-dr-dev
Jorim Jaggi [Thu, 3 Sep 2015 00:24:55 +0000 (17:24 -0700)]
Fix fingerprint settings ripples
Bug:
22471044
Bug:
23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
Maurice Lam [Wed, 2 Sep 2015 23:35:15 +0000 (23:35 +0000)]
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
Maurice Lam [Wed, 2 Sep 2015 21:36:19 +0000 (14:36 -0700)]
[Fingerprint] Update strings for skip dialog
Bug:
23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
Sungmin Choi [Fri, 31 Jul 2015 09:03:52 +0000 (02:03 -0700)]
To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.
Bug:
22209425
Bug:
22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
OSDN Git Service
