Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,596 Commits 3 Branches 0 Tags
85f83ff275ff094daa744367e525102403be6a1f
Commit Graph

458596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zimuzo Ezeozue
85f83ff275 Revert "Fix canonicalizing /sdcard" 
This reverts commit 50e73370ca.

Reason for revert: ag/10112811 is better and more reliable fix

Change-Id: Ice0c0e7a033013b01156898cd58df14b999e700f
 2020-01-17 01:28:36 +00:00
Zim
50e73370ca Fix canonicalizing /sdcard 
We now transform the realpath of /sdcard with FUSE mounts from
/mnt/user/<userid>/emulated/<userid> to
realpath of /storage/emulated/<userid> which is what is expected
without FUSE when matching with VolumeInfo#path.

Test: atest
android.os.storage.cts.StorageManagerTest#testGetExternalUuidForPath
Bug: 135341433

Change-Id: I8ffe8ac7109329d360fe18ce3e6ed227672b77bc
 2020-01-08 14:58:04 +00:00
Martijn Coenen
f8ac43edab Merge "StorageManagerService: use correct user when checking isDeviceSecure()." 2020-01-07 11:32:29 +00:00
Automerger Merge Worker
62e997ff4f Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" am: 8e56dc3951 am: 937c5b8b40 am: f34444d4da 
Change-Id: I809748116a6004f7fb3f3e9e6ccbee0baa0738d9
 2020-01-07 11:30:17 +00:00
Kholoud Mohamed
b848a1017c Merge "Add default cross-profile package APIs" 2020-01-07 11:29:09 +00:00
Kholoud Mohamed
ae9545e102 Merge "Add INTERACT_ACROSS_PROFILES appop" 2020-01-07 11:28:18 +00:00
Automerger Merge Worker
f34444d4da Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" am: 8e56dc3951 am: 937c5b8b40 
Change-Id: Iabfdbe81c96ae2071a4e2baa2f74d14008f25aec
 2020-01-07 11:15:07 +00:00
Jimmy Chen
331dc3e8af Merge "Wifi: define OEM IE parsing hook function" 2020-01-07 11:10:20 +00:00
Chun-Yi Lee
937c5b8b40 Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" 
am: 8e56dc3951

Change-Id: I0dabf8cf9e0bacd93f504f82d23d2e1f2bcfdb83
 2020-01-07 03:03:23 -08:00
Automerger Merge Worker
8303c9def2 Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 am: ef100e45fe 
Change-Id: Ie4ab2ecaa0778fa6ff7d75e5677dfb4bed1d443d
 2020-01-07 10:45:04 +00:00
TreeHugger Robot
dd753beaa2 Merge "Import translations. DO NOT MERGE" 2020-01-07 10:35:18 +00:00
Automerger Merge Worker
ef100e45fe Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 
Change-Id: Ie3b6457ba196f7aa00ffb6e2fa77e5acbb926374
 2020-01-07 10:30:35 +00:00
Peter Wang
62a1145512 Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" 2020-01-07 10:29:54 +00:00
Treehugger Robot
8e56dc3951 Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" 2020-01-07 10:22:48 +00:00
Neil Fuller
f11a45b756 Merge "Change NetworkTimeUpdateServiceImpl behavior" 
am: 48247d9223

Change-Id: I299a69b5a3abf5da66237f79aa7ca56b6268452a
 2020-01-07 02:14:01 -08:00
Neil Fuller
48247d9223 Merge "Change NetworkTimeUpdateServiceImpl behavior" 2020-01-07 10:07:08 +00:00
Automerger Merge Worker
c82d176593 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 am: ef581020d3 
Change-Id: I2069561edb05b53e565563c8419c689531ff9571
 2020-01-07 09:38:44 +00:00
Tiger Huang
e611e8c42e Merge "Wait for the right handler in TaskPositioningControllerTests" 2020-01-07 09:37:09 +00:00
Automerger Merge Worker
ef581020d3 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
 2020-01-07 09:25:49 +00:00
Martijn Coenen
7c1df2d120 StorageManagerService: use correct user when checking isDeviceSecure(). 
Instead of always using user 0.

Test: builds
Change-Id: Ia8e109adcabb4d1e47979e59f563487bc0f3e8e7
 2020-01-07 10:21:42 +01:00
markchien
75b0369615 Merge "Change tetheroffloadjni to tetheringutilsjni" 
am: 3e16a10a3e

Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
 2020-01-07 01:12:30 -08:00
Treehugger Robot
3e16a10a3e Merge "Change tetheroffloadjni to tetheringutilsjni" 2020-01-07 09:05:43 +00:00
Chun-Yi Lee
4b027f3c9a Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." 
This reverts commit 1aa15ffa25.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I0515cd2e7c5e4d296def579e23c3ddbd59250711
 2020-01-07 08:42:41 +00:00
Automerger Merge Worker
b8bf014c1f Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a am: e2c143c1d8 
Change-Id: I0ada01aecdd91b47ebf3ac8561da0b6afaeaff3f
 2020-01-07 08:34:29 +00:00
Automerger Merge Worker
e2c143c1d8 Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a 
Change-Id: Ie7b5b2fedba3f56e612b0951b27fbb5b12d98e97
 2020-01-07 08:21:36 +00:00
Zimuzo Ezeozue
19091e22a9 Merge "Fix /mnt/user/<userid> permission bits" 2020-01-07 08:09:43 +00:00
Tobias Thierer
d913b9037a Merge "android.net: Update OWNERS." 
am: 2b89b0c7ca

Change-Id: I77ffc427638cf6297da48cb83449d455f7b6d220
 2020-01-07 00:03:08 -08:00
TreeHugger Robot
fab33b6bf5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-07 07:58:18 +00:00
markchien
771c3e9a3d Change tetheroffloadjni to tetheringutilsjni 
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -Off/On hotspot with ipv6 upstream

Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
 2020-01-07 07:42:13 +00:00
Treehugger Robot
2b89b0c7ca Merge "android.net: Update OWNERS." 2020-01-07 07:38:36 +00:00
Automerger Merge Worker
79fe3e63d8 Merge "Make TokenBucket available to the network stack" am: a6a681768c am: 0d25ca0ffd am: c1c1a355f0 
Change-Id: Ifcd3c9562bdec26406e59f6aef5c28d308204909
 2020-01-07 07:32:54 +00:00
Automerger Merge Worker
11d0a7fb46 Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 am: 1740e8698d 
Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d
 2020-01-07 07:31:36 +00:00
Jimmy Chen
b1be20a2ac Wifi: define OEM IE parsing hook function 
OEM needs to implement this hook for OEM-supported
security type.

This hook function is empty by default in AOSP.

Bug: 139257562
Test: FrameworksWifiApiTests
Change-Id: Id223c6acc015d33a42afa4dababc1ca6304d471a
 2020-01-07 15:19:51 +08:00
Automerger Merge Worker
c1c1a355f0 Merge "Make TokenBucket available to the network stack" am: a6a681768c am: 0d25ca0ffd 
Change-Id: I14229aaeda5ffc27ef1db944e2be692184a6c366
 2020-01-07 07:16:44 +00:00
Louis Chang
0afea98d72 Merge "Fix DocumentsUI unable to launch" 2020-01-07 07:16:42 +00:00
Automerger Merge Worker
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
johnson.yeh
0d25ca0ffd Merge "Make TokenBucket available to the network stack" 
am: a6a681768c

Change-Id: I94f2cc39d47e38a13b0d9b390f9c064b919dfe00
 2020-01-06 23:05:12 -08:00
Lorenzo Colitti
cf77c50b11 Merge changes If28f0be6,If0f80067 
am: 96529ad7fc

Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
 2020-01-06 23:03:04 -08:00
Treehugger Robot
a6a681768c Merge "Make TokenBucket available to the network stack" 2020-01-07 06:57:46 +00:00
Tiger Huang
4e7c9bbdac Wait for the right handler in TaskPositioningControllerTests 
This CL fixes flaky tests in TaskPositioningControllerTests, and also
corrects some inline comments.

Fix: 147268059
Test: TaskPositioningControllerTests
Change-Id: I0c1f5468435068d95176bac52ec94b4b089f8aac
 2020-01-07 06:49:37 +00:00
Lorenzo Colitti
96529ad7fc Merge changes If28f0be6,If0f80067 
* changes:
  Make LinkPropertiesTest pass, and fix an NPE.
  Add the DHCP server address to LinkProperties.
 2020-01-07 06:43:20 +00:00
Eino-Ville Talvala
0d2ba89d43 Merge "Camera: Add visual samples for android.scaler.cropRegion docs" 2020-01-07 06:25:42 +00:00
Wu Ahan
ff5e6eb7d7 Merge "Validate if the surface of wallpaper is valid before creating EglSurface." 2020-01-07 05:50:16 +00:00
TreeHugger Robot
61b4e7136e Merge "Made setPolicyDataEnabled a SystemApi" 2020-01-07 05:39:30 +00:00
TreeHugger Robot
5a6f835e28 Merge "Stop or destroy activities when all resumed activities are shown" 2020-01-07 05:08:24 +00:00
Automerger Merge Worker
04b4c4613b Merge "isTetheringApnRequired's permission is wrong." am: 6297d2548d am: bdce8daaf6 am: 281310f168 
Change-Id: I7768a96a105d637c0293a0c94bc76967db722006
 2020-01-07 05:05:05 +00:00
Hyundo Moon
78cdc1409f Merge "MediaRouter2: Implement RouteSessionController#release" 2020-01-07 05:00:43 +00:00
Automerger Merge Worker
281310f168 Merge "isTetheringApnRequired's permission is wrong." am: 6297d2548d am: bdce8daaf6 
Change-Id: I8f261ea142bc8fe2b31dd95061f6fdcd50407977
 2020-01-07 04:50:50 +00:00
SongFerng Wang
bdce8daaf6 Merge "isTetheringApnRequired's permission is wrong." 
am: 6297d2548d

Change-Id: Id80bd5f1696f7e7ba740ade70231d8dc252db9c1
 2020-01-06 20:41:41 -08:00
SongFerng Wang
6297d2548d Merge "isTetheringApnRequired's permission is wrong." 2020-01-07 04:34:59 +00:00