OSDN Git Service
Alex Klyubin [Tue, 22 Sep 2015 17:24:16 +0000 (17:24 +0000)]
am
12b06cb6: am
7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
* commit '
12b06cb6c0e09c997ab32dd5ee5be78abc78c50e':
Fix MMS delivery issue by permitting HTTP from Settings app.
Alex Klyubin [Tue, 22 Sep 2015 17:16:28 +0000 (17:16 +0000)]
am
7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev
* commit '
7709f92dc0759f1c383f16ccef6bb0e408c0f085':
Fix MMS delivery issue by permitting HTTP from Settings app.
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:52:33 +0000 (21:52 +0000)]
am
0acd070f: am
61b8955c: 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 '
0acd070f559ba464378c2871733b0ba3a07514f2':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:52:32 +0000 (21:52 +0000)]
am
0ac53af0: am
825518b7: 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 '
0ac53af01a8c644925f9d30596de7a36ec5ef5b8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:44:49 +0000 (21:44 +0000)]
am
61b8955c: 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 '
61b8955c86a9c949888949be91c06fadf04890cb':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:44:48 +0000 (21:44 +0000)]
am
825518b7: 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 '
825518b7b996d5d8df84f801b3d1725e786f132f':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
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:49:01 +0000 (02:49 +0000)]
am
fdb277f0: (-s ours) am
2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fdb277f08176de59246664396d164cd95d2c6878':
Import translations. DO NOT MERGE
Paul Lawrence [Sat, 19 Sep 2015 02:49:00 +0000 (02:49 +0000)]
am
57ca15e4: am
0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
* commit '
57ca15e45e2bac389d77173084b91de2551dc407':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
Baligh Uddin [Sat, 19 Sep 2015 02:41:25 +0000 (02:41 +0000)]
am
2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2d0db3098ebdbe20a0cbe4a8afc7b8e593317d3b':
Import translations. DO NOT MERGE
Paul Lawrence [Sat, 19 Sep 2015 02:41:22 +0000 (02:41 +0000)]
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"
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 01:13:26 +0000 (01:13 +0000)]
am
50ee327f: am
d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
* commit '
50ee327fb9606fdc89df9e00558231692951aa90':
Add summary for 0 fingerprint settings preference
Jim Miller [Sat, 19 Sep 2015 01:08:31 +0000 (01:08 +0000)]
am
d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
* commit '
d251fed3ef24b02697a375bf32f382338f500f53':
Add summary for 0 fingerprint settings preference
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:37:40 +0000 (00:37 +0000)]
am
a3add1d2: am
c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
* commit '
a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
Add color transform setting
Justin Harrison [Sat, 19 Sep 2015 00:29:31 +0000 (00:29 +0000)]
am
c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
* commit '
c6a96d4076ecddce57c864683a47e581ca2517f5':
Add color transform setting
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:42:31 +0000 (20:42 +0000)]
am
65477c80: am
031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
* commit '
65477c800fabbce6586bc2782ce56167e0bd2734':
Update implementation to match BatteryStats.Uid
Adam Lesinski [Fri, 18 Sep 2015 20:32:04 +0000 (20:32 +0000)]
am
031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
* commit '
031bbef57e7d8e18b238bac4e3e7c356b0055655':
Update implementation to match BatteryStats.Uid
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:38:15 +0000 (15:38 +0000)]
am
aead1b25: am
43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
* commit '
aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
Paul Lawrence [Fri, 18 Sep 2015 15:32:29 +0000 (15:32 +0000)]
am
43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
* commit '
43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
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:44:08 +0000 (14:44 +0000)]
am
8d28491a: am
c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '
8d28491a2f2d8ef8e2142171d290f46f381c8a76':
Remove don't kill flag from CryptKeeper to stop logspam
Paul Lawrence [Fri, 18 Sep 2015 14:37:01 +0000 (14:37 +0000)]
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
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:27:34 +0000 (14:27 +0000)]
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
Baligh Uddin [Tue, 15 Sep 2015 14:20:20 +0000 (14:20 +0000)]
am
ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Sep 2015 14:12:42 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Hyejin [Tue, 15 Sep 2015 00:37:16 +0000 (00:37 +0000)]
am
7e84e35f: am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
7e84e35fb191c0967feb0352a39a3147ceb68a8b':
Fix IndexOutOfBoundsException while silent provisioning check
Hyejin [Tue, 15 Sep 2015 00:29:32 +0000 (00:29 +0000)]
am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
5565b5cd7537e9360e6382507a45cf5e091a5108':
Fix IndexOutOfBoundsException while silent provisioning check
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
Selim Cinek [Sat, 12 Sep 2015 00:47:34 +0000 (00:47 +0000)]
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.
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:38:18 +0000 (00:38 +0000)]
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.
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 23:22:17 +0000 (23:22 +0000)]
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
Jorim Jaggi [Fri, 11 Sep 2015 23:22:16 +0000 (23:22 +0000)]
am
c77839e0: am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
Finish trampoline activity for ConfirmDeviceCredential immediately
Jorim Jaggi [Fri, 11 Sep 2015 22:33:38 +0000 (22:33 +0000)]
am
5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
* commit '
5bd836aac3b7602a4166bc836aaa33ccc7107d74':
Add timeout if we dont get onEnterAnimationComplete
Jorim Jaggi [Fri, 11 Sep 2015 22:33:37 +0000 (22:33 +0000)]
am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
aee6e41e5188e8809d8439f05fdce311aa7171c8':
Finish trampoline activity for ConfirmDeviceCredential immediately
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:41:33 +0000 (16:41 +0000)]
am
c5d18345: (-s ours) am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
c5d183458c13a0d780aee93f256ea5dc6b22f815':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:32:04 +0000 (16:32 +0000)]
am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
cdf00b1640bc621d513dcb965f44a4ace8bacece':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:30:31 +0000 (16:30 +0000)]
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
Baligh Uddin [Fri, 11 Sep 2015 16:24:31 +0000 (16:24 +0000)]
am
723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
723c5b38b8fbd2db3a64b1ce782f8f760271ac98':
Import translations. DO NOT MERGE
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 02:18:10 +0000 (02:18 +0000)]
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
Jorim Jaggi [Fri, 11 Sep 2015 02:09:36 +0000 (02:09 +0000)]
am
5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
* commit '
5c49b5a4b2cb1d90a02ce8610340db7020715de7':
Fix crash in when restoring CredentialCheckResultTracker Fragment
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
Jason Monk [Thu, 10 Sep 2015 20:41:37 +0000 (20:41 +0000)]
am
72fecf9f: am
d3c60afe: Include the usb data mode regardless of data role
* commit '
72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
Include the usb data mode regardless of data role
Jason Monk [Thu, 10 Sep 2015 20:35:52 +0000 (20:35 +0000)]
am
d3c60afe: Include the usb data mode regardless of data role
* commit '
d3c60afe5267eb614b9c0a99b797e6bbb51de16f':
Include the usb data mode regardless of data role
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 01:02:39 +0000 (01:02 +0000)]
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
Jorim Jaggi [Thu, 10 Sep 2015 00:53:48 +0000 (00:53 +0000)]
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
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 23:08:06 +0000 (23:08 +0000)]
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.
Jim Miller [Wed, 9 Sep 2015 23:02:34 +0000 (23:02 +0000)]
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.
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 [Wed, 9 Sep 2015 18:06:25 +0000 (18:06 +0000)]
am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 17:58:29 +0000 (17:58 +0000)]
am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
Hide or show APNs with type="ims" as CarrierConfig
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 22:02:24 +0000 (22:02 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:53:45 +0000 (21:53 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:40:27 +0000 (14:40 -0700)]
Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
OSDN Git Service
