summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 35972f77: am d516a55a: Fix MMS delivery issue by permitting HTTP from ↵Alex Klyubin2015-09-221-1/+1
|\ | | | | | | | | | | | | TelephonyProvider. * commit '35972f77da2251dcb15ebc1c7fbd4be497b5bd0f': Fix MMS delivery issue by permitting HTTP from TelephonyProvider.
| * am d516a55a: Fix MMS delivery issue by permitting HTTP from TelephonyProvider.Alex Klyubin2015-09-221-1/+1
| |\ | | | | | | | | | | | | * commit 'd516a55a62c83b08cfc5fa22249c6cea94cf8fff': Fix MMS delivery issue by permitting HTTP from TelephonyProvider.
| | * Fix MMS delivery issue by permitting HTTP from TelephonyProvider.Alex Klyubin2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 TelephonyProvider to permit cleartext network traffic, so that all packages loaded into the com.android.phone process uses the same policy. Bug: 24222050 Change-Id: I37617fff352da9f3f8371d9639a8597cd9983305
* | | am e15e4151: am ee780f86: am 47f5b454: Add INTERACT_ACROSS_USERS_FULL to ↵Amit Mahajan2015-08-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | TelephonyProvider. * commit 'e15e4151ec564e39595c324e1218ea8bb827d6cf': Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.
| * | am ee780f86: am 47f5b454: Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.Amit Mahajan2015-08-131-0/+1
| |\| | | | | | | | | | | | | * commit 'ee780f863ab70502de49ad96187c35735673ed58': Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.
| | * am 47f5b454: Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.Amit Mahajan2015-08-131-0/+1
| | |\ | | | | | | | | | | | | | | | | * commit '47f5b4542772fc4429c548a980b37d48d4e93d11': Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.
| | | * Add INTERACT_ACROSS_USERS_FULL to TelephonyProvider.Amit Mahajan2015-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyProvider requires INTERACT_ACROSS_USERS_FULL for calling notifyChange() but does not declare it in its manifest. It generally works as it picks it up by way of shared user ID with Telephony service. Since Telephony service is not installed in the TV emulator, notifyChange() throws SecurityException. Bug: 22977803 Change-Id: Ib224bf24634132d54494e3bd7a01dc925122b124
* | | | am 6c6e5388: (-s ours) am c9692826: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '6c6e53886a82df478ba89152a55289e461afb5c7': Import translations. DO NOT MERGE
| * | | am c9692826: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'c969282697724c6f14f21b1760a94ae9767f732a': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-311-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib622afdddc35fd525c99fba7e16e47c12f26d6bf Auto-generated-cl: translation import
* | | | am 689721da: (-s ours) am 77b6b0eb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '689721da0c87d8dddb6354aaef58d4d7cc0826e5': Import translations. DO NOT MERGE
| * | | am 77b6b0eb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '77b6b0ebfeb2ff7344b07b45e108692aa421ce4e': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-223-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib5cdda01eb0c7a068c50852c35b5db2531b04205 Auto-generated-cl: translation import
* | | | am 8eae5068: (-s ours) am 69a7483e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '8eae506819b40370f2b1a55f7d72dec26e2c9410': Import translations. DO NOT MERGE
| * | | am 69a7483e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '69a7483e2d211131b8f5221dcf6815ed3656a768': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-2077-76/+98
| | | | | | | | | | | | | | | | | | | | Change-Id: I47aee8e85237862c322a057e06940176c5bd752c Auto-generated-cl: translation import
* | | | am 29135b81: am abca71ea: am 333a9028: Increase app_label char limit to 40Jay Shrauner2015-07-171-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '29135b81b260c77150744f67d79eb332b7d01e0c': Increase app_label char limit to 40
| * | | am abca71ea: am 333a9028: Increase app_label char limit to 40Jay Shrauner2015-07-171-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit 'abca71eab511eef7c7ff8fe4703bb2e5239b3ee9': Increase app_label char limit to 40
| | * | am 333a9028: Increase app_label char limit to 40Jay Shrauner2015-07-171-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit '333a9028766ba62f52e3bf9ea994ebccd05f13d3': Increase app_label char limit to 40
| | | * Increase app_label char limit to 40Jay Shrauner2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | Bug:22520763 Change-Id: Iab5981fbe43cec65451f6ea4fe532085f10ef0ef
* | | | am 9f1ee090: am 1d2b4cb1: am 0704702d: Merge "Add new columns corresponding ↵Sanket Padawe2015-07-161-12/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | to Cellbroadcast settings screen." into mnc-dev * commit '9f1ee0906adce31cb6c83e06c03439193b8ffa76': Add new columns corresponding to Cellbroadcast settings screen.
| * | | am 1d2b4cb1: am 0704702d: Merge "Add new columns corresponding to ↵Sanket Padawe2015-07-161-12/+58
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Cellbroadcast settings screen." into mnc-dev * commit '1d2b4cb16c29d5ab4c6101c80ba1ecc9c6f771ab': Add new columns corresponding to Cellbroadcast settings screen.
| | * | am 0704702d: Merge "Add new columns corresponding to Cellbroadcast settings ↵Sanket Padawe2015-07-161-12/+58
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | screen." into mnc-dev * commit '0704702d882a2e81bd98655bdf34bf906e709038': Add new columns corresponding to Cellbroadcast settings screen.
| | | * Merge "Add new columns corresponding to Cellbroadcast settings screen." into ↵Sanket Padawe2015-07-161-12/+58
| | | |\ | | | | | | | | | | | | | | | mnc-dev
| | | | * Add new columns corresponding to Cellbroadcast settings screen.Sanket Padawe2015-07-131-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db version was upgraded to 14 on both l-mr1-msim-dev and lmp-mr1-wfc-dev with different db changes. After this upgrade all changes should be merged and db version upgraded to 16. Bug: 22360525 Change-Id: I23a63b13fd3f04c272fef70b5414b511f4d2b8d2
* | | | | am b7fa3343: am 63443bec: am 5856975d: Change Settings nameJay Shrauner2015-07-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7fa33432f5faaed34275e2abc822675c4f883a2': Change Settings name
| * | | | am 63443bec: am 5856975d: Change Settings nameJay Shrauner2015-07-151-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '63443bec54f01d0bca0d66f57ca5dd0e7fc42440': Change Settings name
| | * | | am 5856975d: Change Settings nameJay Shrauner2015-07-151-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '5856975d44c088ee27d66a6d44bac89f9cd42f37': Change Settings name
| | | * | Change Settings nameJay Shrauner2015-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Settings name to "Phone and Messaging Storage" Bug:22510177 Change-Id: Iffed90c7c4bc1bfa50f3d2f13037beb97cf12b0a
* | | | | am 5b36696e: (-s ours) am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '5b36696e4280db82808a190dcd22cc1789ab991a': Import translations. DO NOT MERGE
| * | | | am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0b5686918ec2ba3dfd2d6b1ec2081ac28f70d66f': Import translations. DO NOT MERGE
| | * | | am ae1c4b2c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'ae1c4b2cd0fb54fbb945b39f0e6e7dee254ac49b': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-2/+2
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I0bcd0f0596947c856ed498aace1edd332eeb3c0a Auto-generated-cl: translation import
* | | | am 98aa99f7: (-s ours) am ed6f7ec1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '98aa99f778f5a9d07e04713aa23548127586c740': Import translations. DO NOT MERGE
| * | | am ed6f7ec1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | |/ | |/| | | | | | | * commit 'ed6f7ec1b8dd8610dc1b143c11fa62fedce6add1': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-112-2/+2
| |/ | | | | | | | | Change-Id: Iad69f948a7eaea34705e92298ea1e4e1e19f4fa4 Auto-generated-cl: translation import
* | am f47a76e0: Merge "Change to actually remove user/carrier edited entries on ↵Amit Mahajan2015-06-161-6/+23
|\| | | | | | | | | | | | | delete()." into mnc-dev * commit 'f47a76e0b79148b1e9ff72f47cd28f44ef56959d': Change to actually remove user/carrier edited entries on delete().
| * Merge "Change to actually remove user/carrier edited entries on delete()." ↵Amit Mahajan2015-06-161-6/+23
| |\ | | | | | | | | | into mnc-dev
| | * Change to actually remove user/carrier edited entries on delete().Amit Mahajan2015-06-151-6/+23
| | | | | | | | | | | | | | | Bug: 21815161 Change-Id: I23a28c17b1ff4126c12f6a7288d9c868ec2303b6
* | | am 86b8a2cf: Dump default SMS app package nameYe Wen2015-06-111-0/+13
|\| | | | | | | | | | | | | | * commit '86b8a2cfb7558ec500b4de46bac3d873eaf6028f': Dump default SMS app package name
| * | Dump default SMS app package nameYe Wen2015-06-111-0/+13
| |/ | | | | | | | | | | b/21736547 Change-Id: I8e636b720f78ccb187b08a739b18810db84a40b5
* | am c7e357fd: Merge "Telephony provider does not use cleartext network ↵Alex Klyubin2015-06-091-1/+2
|\| | | | | | | | | | | | | traffic." into mnc-dev * commit 'c7e357fd5efb66d753e97527a4c66f0054ac34d4': Telephony provider does not use cleartext network traffic.
| * Merge "Telephony provider does not use cleartext network traffic." into mnc-devAlex Klyubin2015-06-091-1/+2
| |\
| | * Telephony provider does not use cleartext network traffic.Alex Klyubin2015-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This declares to the platform and tools that this provider does not use cleartext network traffic. The platform and tools will be blocking (on best effort basis) attempts to use such traffic by this provider. For example, attempts to use HTTP (rather than HTTPS) will be blocked. Bug: 19215516 Change-Id: I92d33046f6b2a6fb9a246f56d76edc9cbfb70d7d
* | | am 3cc84cb0: Merge "Change to preserve user/carrer added/edited APNs on ↵Amit Mahajan2015-06-081-127/+287
|\| | | | | | | | | | | | | | | | | | | | upgrade." into mnc-dev * commit '3cc84cb069f7bfab290b86aa97cdec21f716a854': Change to preserve user/carrer added/edited APNs on upgrade.
| * | Merge "Change to preserve user/carrer added/edited APNs on upgrade." into ↵Amit Mahajan2015-06-081-127/+287
| |\ \ | | | | | | | | | | | | mnc-dev
| | * | Change to preserve user/carrer added/edited APNs on upgrade.Amit Mahajan2015-05-211-127/+287
| | |/ | | | | | | | | | | | | Bug: 21113962 Change-Id: Id9baa79e983942a8c8f933fa52ccf1a431f7c5b5
* | | am 2e7b1f4f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-290-0/+0
|\| | | | | | | | | | | | | | * commit '2e7b1f4f4c2fbcd97d71c9e813057b9961d32e89': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEGeoff Mendal2015-05-291-0/+10
| |/ | | | | | | | | Change-Id: I07de7fbe9a21bf2f0110f5576f57ed3442bf6958 Auto-generated-cl: translation import
* | am e5465800: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
|\| | | | | | | | | * commit 'e546580032447f846151357608d5fa576deff5bb': Import translations. DO NOT MERGE