PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,945 Commits 1 Branch 0 Tags
f2ae4cb731a2bc45db3060fa84d372dbc3358909
Commit Graph

21945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
f2ae4cb731 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.
 2015-09-22 17:24:16 +00:00
Alex Klyubin
12b06cb6c0 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.
 2015-09-22 17:16:28 +00:00
Alex Klyubin
7709f92dc0 Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev 2015-09-22 17:09:24 +00:00
Zach Jang
00108830be 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
 2015-09-21 21:52:33 +00:00
Zach Jang
4925e6234f 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
 2015-09-21 21:52:32 +00:00
Zach Jang
0acd070f55 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
 2015-09-21 21:44:49 +00:00
Zach Jang
0ac53af01a 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
 2015-09-21 21:44:48 +00:00
Zach Jang
61b8955c86 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
 2015-09-21 21:37:15 +00:00
Zach Jang
825518b7b9 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
 2015-09-21 21:37:14 +00:00
Zach Jang
8fef057651 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
 2015-09-21 21:30:07 +00:00
Zach Jang
2ead093496 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
 2015-09-21 21:30:06 +00:00
Zach Jang
7b2994d2e8 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
 2015-09-21 21:06:16 +00:00
Zach Jang
386c7763eb 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
 2015-09-21 21:06:13 +00:00
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
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