Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,704 Commits 3 Branches 0 Tags
bf397e95fd0490cb359e0e5d22e2afa0f50a557a
Commit Graph

430704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
bf397e95fd [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours 
am: 6fbf8171af

Change-Id: I20eec8cb159a97b4c58717d1787f3b76596b587d
 2019-08-24 01:41:17 -07:00
Xin Li
6fbf8171af [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master 
am: abaa7ead61 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaed847d118c102c5ac39c2dba6196a3fb5e80e5f
 2019-08-23 22:00:19 -07:00
Xin Li
db21ccd28a [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours 
am: 377c17d1ea

Change-Id: I076ae7efd81be6ecacfef3d23371397a40dd70ec
 2019-08-23 21:22:03 -07:00
Yi Kong
db8ab235e2 [automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours 
am: 62e3c16301 -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history

Change-Id: If515ca4bdf92eac7a8b70c5b7a743d154d421b94
 2019-08-23 21:19:01 -07:00
Xin Li
377c17d1ea [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
am: bf9040d4f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I44578ad3f5ea369038f2e7a395262bbef1a4556a
 2019-08-23 20:35:13 -07:00
Yi Kong
62e3c16301 [automerger skipped] Fix android-cloexec-pipe clang-tidy warning 
am: 9b00f181da -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history

Change-Id: Icd186bc8c17e56c1327893800cfd8d371e5083c5
 2019-08-23 20:26:22 -07:00
TreeHugger Robot
abaa7ead61 Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master 2019-08-23 20:27:17 +00:00
Yi Kong
9b00f181da Fix android-cloexec-pipe clang-tidy warning 
The upcoming clang-tidy update finds a new instance of
android-cloexec-pipe warning:

FileUtilsTests.cpp:72:13: error: prefer pipe2() with O_CLOEXEC to avoid leaking file descriptors to child processes
ASSERT_EQ(pipe(pipefd), 0);
^~~~~~~~~~~~
pipe2(pipefd, O_CLOEXEC)

Apply the suggested fix by clang-tidy.

Test: build
Bug: 131328001
Exempt-From-Owner-Approval: Cherrypick
Change-Id: Iee772b5c3ed5e2af481e479dab19030f8419290a
Merged-In: Iee772b5c3ed5e2af481e479dab19030f8419290a
(cherry picked from commit f61e2167d5)
(cherry picked from commit 1fa946a2f2)
 2019-08-23 16:46:05 +00:00
Roshan Pius
50d95f3217 Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp 
am: 9f480e0b8a

Change-Id: I71eefc7e423c8e72c6b79fe39a2158f468eeb710
 2019-08-23 08:58:11 -07:00
Xin Li
bf9040d4f9 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: I43a40bdec58806d2238cb937203d4fa67b8f001d
 2019-08-23 15:42:26 +00:00
Roshan Pius
9f480e0b8a Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp 2019-08-23 15:31:17 +00:00
Jared Henderson
37f8b552d3 Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 
am: b2cfc86e8b

Change-Id: Iafaaea922666f5cbcb9020abfddfcf04b7be12d6
 2019-08-23 03:58:31 -07:00
Anna Trostanetski
6f5669ed78 Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 
am: 9b42b7095d

Change-Id: I87ccf6d40babae7a176ccfdaeeb392a6422e0b86
 2019-08-23 03:53:09 -07:00
Jay Patel
77c749611d Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d 
am: 4088527e0c

Change-Id: Ib1088ec8aa9e3afdb05c46681ec8cb7bab74f790
 2019-08-23 03:47:32 -07:00
Da Xing
2476002005 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours 
am: ec2c5c2e18

Change-Id: I96f8f4a9434bd46fb4f203099f12e2ea8a1f9ed5
 2019-08-23 03:40:48 -07:00
Jared Henderson
b2cfc86e8b Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef 
am: 7f1e92a654

Change-Id: I3f8c20191dd0c0487743181a3895fbd795c9fd73
 2019-08-23 03:40:37 -07:00
Anna Trostanetski
9b42b7095d Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d 
am: a105206a92

Change-Id: Ie52fbad2208d57872bfe9aaa92831e2c1375772e
 2019-08-23 03:29:31 -07:00
Jack Yu
3dba92b05c [automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 
am: e0afc80afb -s ours
am skip reason: change_id Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce with SHA1 09ef1cb126 is in history

Change-Id: I1ab848d81071979d4f836381bd4b663c6f4c587d
 2019-08-23 03:27:17 -07:00
Jack Yu
1cf83928e5 [automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd 
am: 966c2eb20d -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history

Change-Id: Ibdc25c5efd53ff01341fe99c8625ab2659ade50a
 2019-08-23 03:26:57 -07:00
Jay Patel
4088527e0c Merge "Fix AVR compatibility." am: 9e4df4985a 
am: babd85e24d

Change-Id: I01d0dd2fffc45c4b2e54990595fb922bff849dc1
 2019-08-23 03:25:18 -07:00
Pengquan Meng
8f843170a4 Merge "Add geo targeting implementation" am: df2293f68b am: 52cd1fe0f1 
am: 13e58d2ed5

Change-Id: I547a85ec8723e1c6b96b51dd09c357d967b20bcc
 2019-08-23 03:22:35 -07:00
Da Xing
ec2c5c2e18 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours 
am: 392130fee5 -s ours
am skip reason: subject contains skip directive

Change-Id: I6aee27637c126e3c02dd7e6f5da234a7905b6525
 2019-08-23 03:20:40 -07:00
Nagaraja
e83d4f6c7d Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 
am: 40efe816dd

Change-Id: I533c0f7c3315bc5094ce4324f907c93b5b16b9a4
 2019-08-23 03:18:47 -07:00
Anna Trostanetski
884ef46cdc Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb 
am: 20f25166c3

Change-Id: Icbdf02f150e14b4c63b24e70e72f0faf3946e130
 2019-08-23 03:15:57 -07:00
Jared Henderson
7f1e92a654 Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" 
am: 87700db4ef

Change-Id: Ia43fd4b1458c8979da8d803083696e8dff26ae73
 2019-08-23 03:15:53 -07:00
Tobias Thierer
bc59f857aa Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 
am: b0c5a7af5a

Change-Id: Iaa0664ec6cf5f5f993d6cc5719120d7a9461037b
 2019-08-23 03:15:04 -07:00
Oscar Shu
02142d5462 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 
am: 4f05f46f13

Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
 2019-08-23 03:14:04 -07:00
Anna Trostanetski
a105206a92 Merge "Revert "Always apply compat changes to system apps."" 
am: 612c2c731d

Change-Id: I5f6b7f00aec5c97db365cba5113c508c80ce5392
 2019-08-23 03:10:42 -07:00
Jack Yu
e0afc80afb Merge changes from topic "null_callback" am: 5ce391b313 
am: 54e83aca93

Change-Id: Ib8ddbf5f5e6b1b22bd7e6e6ee311153f332a5320
 2019-08-23 03:07:05 -07:00
Jack Yu
966c2eb20d Added debug messages and watchdog am: 594931f5d9 
am: 75db0a70dd

Change-Id: I54bc7865d6abe84225daea1316b6b7425e40d63b
 2019-08-23 03:06:51 -07:00
Pengquan Meng
13e58d2ed5 Merge "Add geo targeting implementation" am: df2293f68b 
am: 52cd1fe0f1

Change-Id: I85db283d7a47a8fcaf07256aec783c0f91540e40
 2019-08-23 03:02:24 -07:00
Treehugger Robot
87700db4ef Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" 2019-08-23 10:02:17 +00:00
Nagaraja
40efe816dd Merge "Added Part & Addr Constants." am: f5d5de8a0f 
am: 633db92447

Change-Id: I8606aed63df7fb46f805acadf3973f8f4dfe7d33
 2019-08-23 02:58:48 -07:00
Jay Patel
babd85e24d Merge "Fix AVR compatibility." 
am: 9e4df4985a

Change-Id: I6d67424f99eb0a24e0b5dbc70c8ca62ba8ab6457
 2019-08-23 02:55:04 -07:00
Anna Trostanetski
20f25166c3 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 
am: 81af0fc8bb

Change-Id: I815189c133f274d1a754327807915a02e642a44b
 2019-08-23 02:54:36 -07:00
Tobias Thierer
b0c5a7af5a Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c 
am: 41438c3730

Change-Id: Id2c69ea4d9e0c75c871ab4ff3f7e609e4e2746cb
 2019-08-23 02:53:18 -07:00
Oscar Shu
4f05f46f13 Merge "avoid generating reserved local MACs" am: e5d5b73109 
am: 65a98b4002

Change-Id: Id195e44b72fb0f92f4b12fb9a269b39227d1ee0d
 2019-08-23 02:52:20 -07:00
Tobias Thierer
4999ce080d Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc 
am: 1b6d718387

Change-Id: I0deb1fa3af8baf73841322477b914f60abe7641f
 2019-08-23 02:50:36 -07:00
Da Xing
392130fee5 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." 
am: 2eb5d0c183 -s ours
am skip reason: subject contains skip directive

Change-Id: I624a81986dd78ebf6ed2b1c86782834bbebd4a45
 2019-08-23 02:48:44 -07:00
Jack Yu
54e83aca93 Merge changes from topic "null_callback" 
am: 5ce391b313

Change-Id: I0a956cd8b88d956102e912b5567732341faa78fc
 2019-08-23 02:39:24 -07:00
Jack Yu
75db0a70dd Added debug messages and watchdog 
am: 594931f5d9

Change-Id: Iaa6d60382dba87a19f6794201caf51ea7f90d23c
 2019-08-23 02:38:59 -07:00
Tobias Thierer
1b6d718387 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a 
am: 3f1d5d92fc

Change-Id: Ie30ff146804d651ddf922ea790150fbd57a9281d
 2019-08-23 02:33:50 -07:00
Pengquan Meng
52cd1fe0f1 Merge "Add geo targeting implementation" 
am: df2293f68b

Change-Id: Iaa8d3d72bff57cbbd36b9f5ed63807fef2a0b119
 2019-08-23 02:32:14 -07:00
Nagaraja
633db92447 Merge "Added Part & Addr Constants." 
am: f5d5de8a0f

Change-Id: Ieac6f8911910c9fea16d60457b5108222f68ca92
 2019-08-23 02:28:01 -07:00
Anna Trostanetski
81af0fc8bb Merge "Rename android.compat.IPlatformCompat" 
am: ee716a23a2

Change-Id: I88fd93b46bcaa5ed782c407f2a9e9469fb0f5f0e
 2019-08-23 02:26:15 -07:00
Tobias Thierer
41438c3730 Merge "Tweak RuntimeInit docs around MimeMap registration." 
am: bc6371727c

Change-Id: I4c3cee161fec5f8065e4ea77f1bf5aa694909874
 2019-08-23 02:25:10 -07:00
Oscar Shu
65a98b4002 Merge "avoid generating reserved local MACs" 
am: e5d5b73109

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
 2019-08-23 02:24:15 -07:00
Anna Trostanetski
612c2c731d Merge "Revert "Always apply compat changes to system apps."" 2019-08-23 09:19:54 +00:00
Tobias Thierer
3f1d5d92fc Merge "Move default MimeMap implementation to frameworks." 
am: 19c3bdc88a

Change-Id: I4bb456d64ad27dabb7db920d6e40dd32c92af900
 2019-08-23 02:13:28 -07:00
Neil Fuller
7a5ba3f59d Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 
am: 2b52914445

Change-Id: I35325a500dea35edc9a323d7a01a77dd2bbeb26d
 2019-08-23 02:12:16 -07:00