Alex Klyubin
f41fffb8d2
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
2015-09-21 12:29:32 -07:00
Zach Jang
1304f47c1b
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
2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b
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
2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612
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
2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa
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
2015-09-21 18:58:12 +00:00
Baligh Uddin
b9aaf9b271
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
2015-09-19 02:49:01 +00:00
Paul Lawrence
d1edd5318b
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"
2015-09-19 02:49:00 +00:00
Baligh Uddin
fdb277f081
am 2d0db309
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2d0db3098ebdbe20a0cbe4a8afc7b8e593317d3b':
Import translations. DO NOT MERGE
2015-09-19 02:41:25 +00: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
Baligh Uddin
2d0db3098e
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:35:07 +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
2b6208599d
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
2015-09-19 01:13:26 +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
8a44f2c413
am a3add1d2
: am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
Add color transform setting
2015-09-19 00:37:40 +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
0896a2e545
am 65477c80
: am 031bbef5
: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '65477c800fabbce6586bc2782ce56167e0bd2734':
Update implementation to match BatteryStats.Uid
2015-09-18 20:42:31 +00: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
Baligh Uddin
8223038551
Import translations. DO NOT MERGE
...
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
2015-09-18 10:37:08 -07:00
Paul Lawrence
fe9b6d3e2e
am aead1b25
: am 43be4b9b
: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581
am 43be4b9b
: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
2015-09-18 15:26:01 +00:00
Paul Lawrence
98e9c7472c
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
2015-09-18 14:44:08 +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
Zach Jang
8fc9b5b684
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
2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07
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
2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48
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
2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8
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
2015-09-17 20:04:24 +00:00
Zach Jang
c87ceb7ec1
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
2015-09-17 20:04:18 +00:00
Michael Wright
dab743b95c
Always show pairing dialog for device-specific keyboard.
...
Bug: 22876536
Change-Id: Ief9f6343d435747050bb7910f934e4777f5116de
2015-09-17 15:23:46 +01:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
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
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
Zach Jang
6ceb2ba9b8
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -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
Zach Jang
e7e0c03f00
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
2015-09-12 00:40:20 +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