Commit Graph

92344 Commits

Author SHA1 Message Date
kopriva
bfa9ed00e0 Merge "docs: bug 112769174, unclosed parentheses" into pi-dev
am: 6ee6799c03

Change-Id: I0d2c0adccb751909413f49c87238d12f4355558d
2018-10-01 11:52:43 -07:00
Jeff Sharkey
8fe3754f1a Merge changes from topic "bugfix_content_path" am: aa642187cd
am: f8ad474935

Change-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452
2018-10-01 11:40:25 -07:00
Jeff Sharkey
f8ad474935 Merge changes from topic "bugfix_content_path"
am: aa642187cd

Change-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3
2018-10-01 11:25:38 -07:00
Jeff Sharkey
aa642187cd Merge changes from topic "bugfix_content_path"
* changes:
  Add OEM_SOUNDS_DIR variable
  Fix the bug that secondary storage path is judged as internal
  Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
2018-10-01 17:49:03 +00:00
Lorenzo Colitti
b0cac388e4 Merge "Make requestRouteToHost a no-op for system callers." am: f1bcfb6014
am: 07012857ae

Change-Id: Iefddec95271b56007794fa10f7f3a4122c68877e
2018-09-30 23:15:42 -07:00
Lorenzo Colitti
07012857ae Merge "Make requestRouteToHost a no-op for system callers."
am: f1bcfb6014

Change-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac
2018-09-30 23:00:08 -07:00
Treehugger Robot
f1bcfb6014 Merge "Make requestRouteToHost a no-op for system callers." 2018-10-01 05:36:28 +00:00
Lorenzo Colitti
2e31a7c004 Make requestRouteToHost a no-op for system callers.
Everything in the system should now be using proper multinetwork
APIs instead of this insecure and error-prone API.

Make this method do nothing when called by the system. For now,
keep the code around for backwards compatibility for apps
targeting Android releases before M.

Bug: 25824776
Bug: 25876485
Test: FrameworksNetTests pass
Test: CtsNetTestCasesLegacyApi22 pass
Test: CtsNetTestCasesLegacyPermission22 pass
Test: android.net.cts.ConnectivityManagerTest passes
Change-Id: I9b3557faccccc95c7b954db6a13b853b4c7edea0
2018-10-01 12:05:42 +09:00
Remi NGUYEN VAN
755c78a8dd Merge changes I0f997d30,I288ba1f4 am: 53f8591789
am: bc3c6b1314

Change-Id: Icb2c5b89895976263cd713651778061d348ba368
2018-09-30 20:00:51 -07:00
Remi NGUYEN VAN
bc3c6b1314 Merge changes I0f997d30,I288ba1f4
am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9
2018-09-30 19:53:29 -07:00
Treehugger Robot
53f8591789 Merge changes I0f997d30,I288ba1f4
* changes:
  Enable new DHCP server by default
  Use new DHCP server in TetheringTest
2018-10-01 02:18:46 +00:00
kopriva
fdb0bffb0b docs: bug 112769174, unclosed parentheses
Test: make ds-docs

Bug: 112769174

Change-Id: I3322e06bf3b4624a7ed09dc476bdfe715ea0a27a
Exempt-From-Owner-Approval: Docs-only change
2018-09-29 15:22:41 -07:00
Julia Reynolds
efdd7bc91a Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev
am: 1f3c8278e8

Change-Id: I505fb77cea4e861acea138c8661d535b752afae9
2018-09-28 10:00:21 -07:00
TreeHugger Robot
1f3c8278e8 Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev 2018-09-28 16:38:31 +00:00
Remi NGUYEN VAN
e0d8c0e09e Enable new DHCP server by default
Regression tests pass with aosp/764042.

Test: regression automated tests, manual (verified WiFi, bluetooth
      tethering working).
Bug: b/109584964

Change-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78
2018-09-28 12:43:47 +09:00
Amith Yamasani
0631cca3ff Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev
am: 311f0f5da5

Change-Id: I941f1a8f9b6ee2c65ee289a159146d5b2ee95dcc
2018-09-27 18:11:46 -07:00
TreeHugger Robot
311f0f5da5 Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev 2018-09-28 00:50:39 +00:00
kopriva
e052af447d Merge "docs: fix bug 37054309, becuase typo" into pi-dev
am: 9359f3683c

Change-Id: I8ba3e3bd1d6aa296f216343d78cc252385ba64ba
2018-09-27 13:24:29 -07:00
TreeHugger Robot
9359f3683c Merge "docs: fix bug 37054309, becuase typo" into pi-dev 2018-09-27 20:03:29 +00:00
kopriva
7364c11185 docs: fix bug 37054309, becuase typo
Test: make ds-docs

Bug: 37054309

Change-Id: I726ed84d62df4036cc274c48ae2f6968f2b7cc3f
Exempt-From-Owner-Approval: Docs-only change
2018-09-27 11:02:07 -07:00
Julia Reynolds
95bd7221f6 DO NOT MERGE Add notification settings to backup&restore
Change-Id: I421c7487955ee339f88e3957c973375d0f87e2ff
Fixes: 35655737
Test: presubmit unit tests
2018-09-27 13:54:15 +00:00
Jeff Sharkey
5017286aa1 Merge "Fix ExternalStorageProvider always throw exception when rename" am: 8883851c71
am: deb51d8489

Change-Id: I4411270b371f25d7a245f163db8d1a358426b6f2
2018-09-26 09:56:21 -07:00
Jeff Sharkey
deb51d8489 Merge "Fix ExternalStorageProvider always throw exception when rename"
am: 8883851c71

Change-Id: I8c11434930de7f3f51fae6ca4666f1a00a265e64
2018-09-26 09:44:52 -07:00
vnori
7eeb25c5fd Merge "Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures." am: 51ec0ebbee
am: 33c3ab90e0

Change-Id: I05c8550bfece64e52a52f580f73d873a4a9851d8
2018-09-25 16:22:08 -07:00
Tony Huang
ac45599364 Fix ExternalStorageProvider always throw exception when rename
ExternalStorageProvider always throw exception when renameDocument
because it will check file exist when getFileForDocId. However,
beforeVisibleFile is not exist after rename, it will throw
exception. Fix it by put getting beforeVisibleFile before rename.

Test: manual test rename in DocumentsUI
Test: atest RenameActualProviderUiTest
Fix: 113302685
Fix: 115304092
Change-Id: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4
Merged-In: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4
2018-09-25 17:20:28 -06:00
vnori
33c3ab90e0 Merge "Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures."
am: 51ec0ebbee

Change-Id: I9df4af670df12ac2cd379c3bbee15e63b95bbf49
2018-09-25 16:14:19 -07:00
Vasu Nori
694752d5b9 Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures.
Bug: 111614861
Test: tested w/ KitchenSink App
Change-Id: I43895183d7b315f57257e1d2045f17dedcb0cfcd
2018-09-25 21:39:31 +00:00
Nicole Borrelli
3d54533e52 Merge "Fix malformed Javadoc." into pi-dev
am: 3ae3f252b4

Change-Id: Iea60c213e70a8878baeb59b9247ae4bf0eaf5a8d
2018-09-25 14:06:49 -07:00
TreeHugger Robot
3ae3f252b4 Merge "Fix malformed Javadoc." into pi-dev 2018-09-25 20:42:50 +00:00
Makoto Onuki
dd5e4bac40 Merge "Truncate(*1) it if WAL file is too big when opening DB" into pi-dev
am: 0f88f865bd

Change-Id: Ie14cea16f9cf89793a499a1b7c491ebc2f8a8829
2018-09-25 08:27:48 -07:00
Makoto Onuki
0f88f865bd Merge "Truncate(*1) it if WAL file is too big when opening DB" into pi-dev 2018-09-25 15:12:15 +00:00
Adam Vartanian
8879ee4a78 Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2
am: 91d61ea0ed

Change-Id: I541ff04bd67780e8920d802a7935c97e0adb535b
2018-09-25 02:20:26 -07:00
Adam Vartanian
91d61ea0ed Merge "Inline two short methods from Conscrypt"
am: 9da9b33cc2

Change-Id: I4c66064ec1a0569f7766282d6dbee5202906ae00
2018-09-25 02:04:57 -07:00
Makoto Onuki
0939c5a2b3 Truncate(*1) it if WAL file is too big when opening DB
*1 -- not truncate(2) but "PRAGMA wal_checkpoint(TRUNCATE)"

Otherwise, depending on how an app operate on a DB, SQLite may not
have a chance to "shrink" the WAL file.

Fixes: 112777941
Bug: 111939259
Test: atest /android/master/frameworks/base/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java
Test: Manual test with google dailer:
1. With normalized_spam.db-wal > 100MB and receive a phone call
-> WAL file gets truncated to 0 bytes.

2. Restart the dialer process and receive a phone call again
-> WAL file is already 0 bytes; won't be truncated.

3. Restart with the WAL file deleted
Same as #2. WAL file will be created before the added logic, but is 0 bytes,
so it won't be truncated.

4. Test with settings put global sqlite_compatibility_wal_flags truncate_size=1024
-> make sure the threshold is overridden

Merged-in: I2b193603e5dfa493ccccb8123db592f0e9c0e7ae
Change-Id: I2b193603e5dfa493ccccb8123db592f0e9c0e7ae
(cherry picked from commit 96e06002ed)
2018-09-24 22:47:02 +00:00
Felipe Leme
bc75159db6 Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev
am: 45fda27211

Change-Id: I420b0392602e0889862c7d77e62b614e2c5617bf
2018-09-24 15:22:37 -07:00
TreeHugger Robot
45fda27211 Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev 2018-09-24 22:04:27 +00:00
Mike Ma
fef5a7ab31 Merge "More robust read mechanism in KernelCpuProcReader" into pi-dev
am: f76c383f82

Change-Id: I6b70fbe607adb37a93d764615decfca243eff347
2018-09-24 13:12:23 -07:00
Mike Ma
f76c383f82 Merge "More robust read mechanism in KernelCpuProcReader" into pi-dev 2018-09-24 19:53:19 +00:00
Adam Vartanian
54148c0e57 Inline two short methods from Conscrypt
We're trying to reduce unnecessary direct dependencies on Conscrypt.
These two methods are simple and the implementations can't change, so
they're good candidates for inlining directly instead of depending on
the Conscrypt implementation.

Bug: 110404540
Test: atest NetworkSecurityConfigTests (same failures pre/post)
Change-Id: I303d955e3f49885326fe75f451c06a52af745053
2018-09-24 15:34:13 +01:00
Nan Zhang
d837987639 Merge "Fix the unresolved link/see tag error for framework docs" into pi-dev
am: 98d747e7f3

Change-Id: Idf0fadc2d62c872c9bc82388f4d8fbcd58694e83
2018-09-23 02:50:22 -07:00
TreeHugger Robot
98d747e7f3 Merge "Fix the unresolved link/see tag error for framework docs" into pi-dev 2018-09-23 09:34:23 +00:00
Nan Zhang
99adf3cb76 Fix the unresolved link/see tag error for framework docs
Synced with alanv@ that doc weren't federated against AndroidX yet, use
this v7 reference until they migrate the docs to AndroidX.

Test: m -j offline-sdk-docs
Bug: b/116163454
Change-Id: Ib5167c4815708d159945ce6db239f8debdf8f865
2018-09-21 14:58:26 -07:00
Jeffrey Vander Stoep
904252f7a3 Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891
am: 6729107f22

Change-Id: I4ec4b9a8954deec001841566e0722caa1a3fa248
2018-09-21 14:48:32 -07:00
Jeffrey Vander Stoep
6729107f22 Merge "Add ConnectivityManager.getConnectionOwnerUid()"
am: f8529dc891

Change-Id: Ib575a2a03c332d0143ed15652cc9c08c9cff694f
2018-09-21 14:26:19 -07:00
Jeffrey Vander Stoep
f8529dc891 Merge "Add ConnectivityManager.getConnectionOwnerUid()" 2018-09-21 21:04:20 +00:00
David Castro
8bb6b0a7fc Merge "docs: Removes reference to the clock displaying seconds" into pi-dev
am: 02bc7c2228

Change-Id: If238e952c1a923f7ac5c251c7e5c2429bf890ddd
2018-09-21 12:53:01 -07:00
TreeHugger Robot
02bc7c2228 Merge "docs: Removes reference to the clock displaying seconds" into pi-dev 2018-09-21 19:40:38 +00:00
Jeff Vander Stoep
0ac2c0945b Add ConnectivityManager.getConnectionOwnerUid()
Allow VPN apps to lookup the UID owner of a network connection.

Requires specifying the:
 - IP address and port for both the source and destination of a TCP
   connection.
 - IP address and port for either source and destination or just
   source for a UDP connection.
Only TCP and UDP protocols are supported. Only connections for UIDs
that apply to the calling VPN app will be resolved. This is intended
to replace direct app access to /proc/net/{tcp,tcp6,udp,udp6}.

The implementation uses netlink inet_diag sockets[1] to perform
the lookup on TCP sockets as well as UDP sockets when supported
(kernel has CONFIG_INET_UDP_DIAG=y).

[1] http://man7.org/linux/man-pages/man7/sock_diag.7.html

Bug: 9496886
Bug: 109758967
Test: atest HostsideVpnTests
Test: atest InetDiagSocketTest on Taimen with CONFIG_INET_UDP_DIAG
    and on Sailfish without CONFIG_INET_UDP_DIAG.
Change-Id: I2bbc7072dd091e2e653dadf6dc05024c04180f34
2018-09-21 06:16:09 +00:00
Tianjie Xu
acae1964ed Merge "Remove the metrics report in recovery system" am: aff3248507
am: 8deaf75cfd

Change-Id: Id480a047be0799d6afc7cda472b6d4e00b48ec48
2018-09-20 23:01:09 -07:00
Tianjie Xu
8deaf75cfd Merge "Remove the metrics report in recovery system"
am: aff3248507

Change-Id: I62cd28099bb20ba2927f59554c81a2fdf4075626
2018-09-20 22:35:47 -07:00