ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
47081 commits 1 branch 0 tags 217 MiB
Commit graph

47081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jiyong Park
9069b5cd9c Merge "Make /apex on ramdisk" am: 96dc80f97a 
am: 93f1ce510e

Change-Id: I208928407fb44f4ac18159f352cb56a18933c509
 2019-03-06 21:15:13 -08:00
Jiyong Park
93f1ce510e Merge "Make /apex on ramdisk" 
am: 96dc80f97a

Change-Id: I6fad2e40c683c1e447d02d0338335e53c03d0eb9
 2019-03-06 21:11:07 -08:00
Treehugger Robot
96dc80f97a Merge "Make /apex on ramdisk" 2019-03-07 05:03:05 +00:00
Josh Gao
b7dc01a570 Merge "adbd: cleanups in remount/verity." am: 98efc485de 
am: d659bb49be

Change-Id: Ia3353280f106dffd16a4cbdfc05ce110c23fb086
 2019-03-06 18:41:35 -08:00
Josh Gao
d659bb49be Merge "adbd: cleanups in remount/verity." 
am: 98efc485de

Change-Id: Ideadb9d6633d5529710932e849bdf3a4bc9a9999
 2019-03-06 18:37:26 -08:00
Josh Gao
98efc485de Merge "adbd: cleanups in remount/verity." 2019-03-07 02:32:42 +00:00
Jiyong Park
e5dc674a95 Make /apex on ramdisk 
Bug: 127576519
Bug: 127653919
Test: build hikey, check ramdisk has /apex directory
Change-Id: I4e844caa032c0717bd36d323675852ce3681fb01
 2019-03-07 11:17:44 +09:00
Sudheer Shanka
5abe405b9e Merge "Allow callers to pass a flag to not link obb dirs of multiple users." am: 0c8b8af74a 
am: 5a8d603d9d

Change-Id: Ia996870b58caecce6077f5144aeb6b9b59135ade
 2019-03-06 17:02:15 -08:00
Sudheer Shanka
5a8d603d9d Merge "Allow callers to pass a flag to not link obb dirs of multiple users." 
am: 0c8b8af74a

Change-Id: I49f1f35d1033655664a5b335351921f6a286d9e7
 2019-03-06 16:46:51 -08:00
Sudheer Shanka
0c8b8af74a Merge "Allow callers to pass a flag to not link obb dirs of multiple users." 2019-03-07 00:34:59 +00:00
Tao Bao
189e4a7c26 Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb 
am: 9130f5c950

Change-Id: Ia54d08b87b993c7aad6fba4d908d57d2ea22cbb5
 2019-03-06 15:33:43 -08:00
Mark Salyzyn
0530d529a9 Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 am: 6bd04c1570 
am: 492ae86814

Change-Id: I04f5defda4427c5ba1518bd1b196e5b9e2f1ce59
 2019-03-06 15:29:57 -08:00
Tao Bao
9130f5c950 Merge "mkbootimg: extract to 'second' if size not 0" 
am: a3d394e9bb

Change-Id: I0c4fdf31f94e841cdfb00df12845157d9ac750b8
 2019-03-06 14:53:04 -08:00
Tao Bao
a3d394e9bb Merge "mkbootimg: extract to 'second' if size not 0" 2019-03-06 22:43:33 +00:00
Mark Salyzyn
492ae86814 Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 
am: 6bd04c1570

Change-Id: If0bf047ecc94463415455ad48e82390dbef6b8a4
 2019-03-06 14:40:21 -08:00
Treehugger Robot
6bd04c1570 Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 
* changes:
  fs_mgr: remount: automatically disable verity
  fs_mgr: remount: pull root device from fstab
  fs_mgr: test: track device active slot throughout
 2019-03-06 21:53:52 +00:00
Josh Gao
3ed90b75da adbd: cleanups in remount/verity. 
1. Don't clear O_CLOEXEC on an fd we're duping to stdin/out/err: dup2
   does that for us if oldfd != newfd, and we know the fd can't be
   stdin/out/err.
2. Use unique_fd.
3. Remove gotos by breaking the remount logic into its own function.

Test: mma
Change-Id: If9929e7f20de445322fd498e1379a2d4e572cb52
 2019-03-06 13:03:30 -08:00
Jiyong Park
504ba80ad7 Merge "Access apex sysprops via the generated API" am: 51deeb569f 
am: 7c8576d435

Change-Id: I1a98c36da437c7a63faab1551214b694758ad9e3
 2019-03-06 10:10:11 -08:00
Jiyong Park
7c8576d435 Merge "Access apex sysprops via the generated API" 
am: 51deeb569f

Change-Id: I7424032df0258fae058ee87faeb52b672cb8bc1b
 2019-03-06 09:51:44 -08:00
Treehugger Robot
51deeb569f Merge "Access apex sysprops via the generated API" 2019-03-06 17:38:46 +00:00
Florian Mayer
449355f920 Merge "Fix copy / move behaviour of Maps object." am: 30c898f1ca 
am: 7e345a00a1

Change-Id: Iee40ba119988f964dc86ea603a64044f7d0e20e3
 2019-03-06 08:50:41 -08:00
Florian Mayer
7e345a00a1 Merge "Fix copy / move behaviour of Maps object." 
am: 30c898f1ca

Change-Id: I7912a4c29393b7e0fb0e1e26c09160989f8544f2
 2019-03-06 08:46:39 -08:00
Florian Mayer
30c898f1ca Merge "Fix copy / move behaviour of Maps object." 2019-03-06 16:31:10 +00:00
Mark Salyzyn
6a26b4b74d fs_mgr: remount: automatically disable verity 
Disable verity even if -R flag is not supplied.

Test: adb-remount-test.sh
Bug: 127494168
Change-Id: I3506c8e7d5525ca1d0685004c1fb7e26448fa648
 2019-03-06 08:25:36 -08:00
Mark Salyzyn
3babd8488b fs_mgr: remount: pull root device from fstab 
For devices that do not support overlayfs that are system as root,
need to pull /dev/root device from / mount point in fstab.

Test: adb-remount-test.sh
Bug: 126256072
Change-Id: I198c0e8c60770508737318afde95db2966294ff5
 2019-03-06 08:25:36 -08:00
Mark Salyzyn
448fc9783c fs_mgr: test: track device active slot throughout 
Report any discrepancy in the active slot.

Fix a problem with problematic error propagation for adb_cat()

Test: adb-remount-test.sh
Bug: 126256072
Change-Id: I8a5d4e364945c5e60d252333886987b8dca0cfb3
 2019-03-06 08:25:36 -08:00
Yuvraj Saxena
ff5e99a6cd mkbootimg: extract to 'second' if size not 0 
Change-Id: I5f6804be6372371d51d5757f6a5700c07ed5e57f
 2019-03-06 14:23:02 +00:00
David Anderson
8d6eff4fb5 Merge "Use distinct GateKeeper userids when running a GSI." am: 5a465412b1 
am: e4c58c492c

Change-Id: I7f0515095e883a4a42f5fa738388c85fa4e81951
 2019-03-05 19:37:22 -08:00
David Anderson
e4c58c492c Merge "Use distinct GateKeeper userids when running a GSI." 
am: 5a465412b1

Change-Id: Ic4e18aa3253a6b5d00e441a47b025e1a2b09cf24
 2019-03-05 19:22:10 -08:00
David Anderson
5a465412b1 Merge "Use distinct GateKeeper userids when running a GSI." 2019-03-06 02:40:03 +00:00
Matthew Maurer
7c9ef814b1 Merge "Clang-format before updating storage proxy" am: 2d85880b49 
am: 71e96ea355

Change-Id: Iac10899a94dc084eecab080cd1f45c17d2975212
 2019-03-05 18:20:27 -08:00
David Anderson
a7a8e3c3cf Merge "Support FiemapWriters that extend across multiple files." am: 925c78b7e8 
am: 461c245b2e

Change-Id: I033fa0548bcbf3fd7e64336c8bdd04463abbb5e5
 2019-03-05 18:18:19 -08:00
David Anderson
35bf6c9a82 Merge "Add more filesystem support to libfiemap_writer." am: 79a43cf135 
am: 90c7e99998

Change-Id: I15c3870f7d6c8c705daec0465c94c069e5df4351
 2019-03-05 18:09:49 -08:00
Matthew Maurer
71e96ea355 Merge "Clang-format before updating storage proxy" 
am: 2d85880b49

Change-Id: I4326644ebc3f14c72c97c9fdb279026d97aee0ac
 2019-03-05 17:25:11 -08:00
Treehugger Robot
2d85880b49 Merge "Clang-format before updating storage proxy" 2019-03-06 00:53:25 +00:00
David Anderson
461c245b2e Merge "Support FiemapWriters that extend across multiple files." 
am: 925c78b7e8

Change-Id: I669d3955b3fd704ad14d6cb276120d0f3d0c8f11
 2019-03-05 16:38:06 -08:00
David Anderson
90c7e99998 Merge "Add more filesystem support to libfiemap_writer." 
am: 79a43cf135

Change-Id: Ib3c6d2515ae45aaf28db18a1bc1729bf0a074a66
 2019-03-05 16:29:45 -08:00
Suren Baghdasaryan
a4bd8777d3 Merge "Add min_score_adj into LmkKillOccurred event" am: a953ae0546 
am: efcab54b55

Change-Id: I0c1f8f60ef70181e4d3e1399eae45723040174f5
 2019-03-05 16:14:07 -08:00
Jim Blackler
e7a9fabd64 Add start time to LmkKillOccurred 
This is to measure an application's behavior with respect to being LMKed
(the longer an app lives before being LMKed, the better).

Bug: 119854389
Test: Manual
Change-Id: I4ef6433391c8758626334731d2b5de038e4468ae
Merged-In: I4ef6433391c8758626334731d2b5de038e4468ae
(cherry picked from I4ef6433391c8758626334731d2b5de038e4468ae)
 2019-03-05 15:47:56 -08:00
Rajeev Kumar
e7cfa67a05 Read memory stats from /proc/pid/stat file. 
(cherry pick from commit 0301683e49)
Bug: 117333340
Test: Manual testing using alloc-stress tool
Merged-In: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd

Change-Id: I8ab08606dba7de2f65711204453067dbfbdcbdd8
 2019-03-05 15:46:07 -08:00
Jim Blackler
b68fe506e0 [automerger skipped] Add start time to LmkKillOccurred 
am: 962e0442d1 -s ours
am skip reason: change_id I4ef6433391c8758626334731d2b5de038e4468ae with SHA1 1417cdbddb is in history

Change-Id: I56f76418a5c6a3435dec766d731068f60bd4b642
 2019-03-05 15:27:13 -08:00
Rajeev Kumar
9eee2302ee [automerger skipped] Read memory stats from /proc/pid/stat file. 
am: 2bc24f88ca -s ours
am skip reason: change_id Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd with SHA1 4dbc24d393 is in history

Change-Id: I5676596b2ee9f7448faa0b0274ac9425c7525fb0
 2019-03-05 15:26:28 -08:00
Suren Baghdasaryan
efcab54b55 Merge "Add min_score_adj into LmkKillOccurred event" 
am: a953ae0546

Change-Id: Ib1a35290221974736f86eda9db57e27e831a4813
 2019-03-05 15:11:38 -08:00
David Anderson
925c78b7e8 Merge "Support FiemapWriters that extend across multiple files." 2019-03-05 23:06:19 +00:00
Sudheer Shanka
cabc52646a Allow callers to pass a flag to not link obb dirs of multiple users. 
Bug: 110960295
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Change-Id: I738e7e6365fb4917f1172c578281e1835a5012c2
 2019-03-05 14:41:54 -08:00
Jim Blackler
962e0442d1 Add start time to LmkKillOccurred 
This is to measure an application's behavior with respect to being LMKed
(the longer an app lives before being LMKed, the better).

Bug: 119854389
Test: Manual
Change-Id: I4ef6433391c8758626334731d2b5de038e4468ae
Merged-In: I4ef6433391c8758626334731d2b5de038e4468ae
(cherry picked from I4ef6433391c8758626334731d2b5de038e4468ae)
 2019-03-05 11:53:17 -08:00
Rajeev Kumar
2bc24f88ca Read memory stats from /proc/pid/stat file. 
(cherry pick from commit 0301683e49)
Bug: 117333340
Test: Manual testing using alloc-stress tool
Merged-In: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd

Change-Id: I8ab08606dba7de2f65711204453067dbfbdcbdd8
 2019-03-05 11:53:14 -08:00
Mark Salyzyn
b6f63c5f1e Merge "fs_mgr: remount: add partition argument list" am: 4c46285e2e 
am: 14fea4f7a2

Change-Id: I065001cbfb323245c9513d129f6e2e682a3b93de
 2019-03-05 10:24:30 -08:00
Mark Salyzyn
14fea4f7a2 Merge "fs_mgr: remount: add partition argument list" 
am: 4c46285e2e

Change-Id: I343332051ac7a99822d940e5e3d69af12d541c0b
 2019-03-05 10:20:12 -08:00
David Anderson
79a43cf135 Merge "Add more filesystem support to libfiemap_writer." 2019-03-05 18:14:53 +00:00