Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
383,903 Commits 3 Branches 0 Tags
2e563d40befea222ac9738384bb0ee7e271bd055
Commit Graph

383903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
2e563d40be Merge "Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev am: cd8eace91d" into pi-dev-plus-aosp 2019-02-26 23:51:32 +00:00
Dan Sandler
664bfc8aff Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev 
am: cd8eace91d

Change-Id: I3d6d5c3c4f00e7f04be9eefbd94809feeea821ff
 2019-02-26 15:50:56 -08:00
Martin Stjernholm
9669a5421d Merge "Log the pid of the forked zygote child." am: 820cfa422c 
am: 181c318f1f

Change-Id: I8be339d9f5f589e7675d215ca754156a91858712
 2019-02-26 15:50:55 -08:00
Martin Stjernholm
181c318f1f Merge "Log the pid of the forked zygote child." 
am: 820cfa422c

Change-Id: Ic569ae560a9efd9ceb5861b67c397a2a37f6f29c
 2019-02-26 15:42:20 -08:00
TreeHugger Robot
cd8eace91d Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev 2019-02-26 23:35:10 +00:00
Treehugger Robot
820cfa422c Merge "Log the pid of the forked zygote child." 2019-02-26 23:22:52 +00:00
Hall Liu
9faf498f65 Merge "Rename the RTT audio flag in ImsStreamMediaProfile" am: 3d7b3fb737 
am: d2fbd99a76

Change-Id: Iff21bbda55f9a6afd9866ebd0042321c6745bf40
 2019-02-26 14:25:33 -08:00
Hall Liu
d2fbd99a76 Merge "Rename the RTT audio flag in ImsStreamMediaProfile" 
am: 3d7b3fb737

Change-Id: Idac87bcff3f8deabc139cdcf2e3dec6e9c380acc
 2019-02-26 14:15:22 -08:00
Hall Liu
3d7b3fb737 Merge "Rename the RTT audio flag in ImsStreamMediaProfile" 2019-02-26 21:54:40 +00:00
Josh Gao
247b34eaab Merge "Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector." am: 021a9a4a4c 
am: 07113dcf4a

Change-Id: I0e437a232373449833a028ed4f7d12e2b191370a
 2019-02-26 13:53:01 -08:00
Josh Gao
07113dcf4a Merge "Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector." 
am: 021a9a4a4c

Change-Id: I30f887bff2fde8ece7c12e5f112f3da613501bf2
 2019-02-26 13:43:56 -08:00
Josh Gao
021a9a4a4c Merge "Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector." 2019-02-26 21:29:42 +00:00
Xiong Li
7e7fa3073c Merge "Fix the build failure with enabling DEBUG_PSS" am: 0b2044a91c 
am: 97b5903575

Change-Id: I0b36a9dd8c3d12ea645c213104a2a6808b84a9be
 2019-02-26 12:19:34 -08:00
Xiong Li
97b5903575 Merge "Fix the build failure with enabling DEBUG_PSS" 
am: 0b2044a91c

Change-Id: If28f7c90638f104e67acda8fd0340272180e05cc
 2019-02-26 12:09:15 -08:00
Martin Stjernholm
a9bd8c3e56 Log the pid of the forked zygote child. 
Useful to link together the pids of the zygote and its children in logcat
output.

Test: Flash and boot, run "adb logcat"
Change-Id: I524b70aed7d1ce7a378df0e2b2063e23f1f9a454
 2019-02-26 20:05:41 +00:00
Treehugger Robot
0b2044a91c Merge "Fix the build failure with enabling DEBUG_PSS" 2019-02-26 19:49:03 +00:00
Sasha Smundak
19bd4dace1 Merge "Remove unused tests/utils/SleepUtils" am: 548170a66a 
am: bd04aa850e

Change-Id: I8b819ac5497fdbbe41d933ddf0b42c5e14bf4455
 2019-02-26 10:45:19 -08:00
Sasha Smundak
bd04aa850e Merge "Remove unused tests/utils/SleepUtils" 
am: 548170a66a

Change-Id: I2c3ca3b2149fbe2d63b5df5b9a068090666c8ca9
 2019-02-26 10:33:54 -08:00
Treehugger Robot
548170a66a Merge "Remove unused tests/utils/SleepUtils" 2019-02-26 18:15:51 +00:00
Sasha Smundak
aef4b82881 Remove unused tests/utils/SleepUtils 
The presense of these files hinders the conversion of the makefiles
to the blueprints (causes failure in the internal builds due to lacking
files).

Bug: 122332340
Test: treehugger
Change-Id: I2a3c38cbba7c14ae1b2880c73c7f6514816f0e68
 2019-02-26 17:43:22 +00:00
Paul Duffin
a8025a851d Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" am: e051b0c95e 
am: 643318f4d2

Change-Id: I42f0210c0830bc70a26c21ab638da9d248d91f79
 2019-02-26 03:23:22 -08:00
Paul Duffin
643318f4d2 Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" 
am: e051b0c95e

Change-Id: I00bdd20cd4e215e90b063be2a1265883ed98111f
 2019-02-26 03:14:07 -08:00
Paul Duffin
e051b0c95e Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" 2019-02-26 10:59:54 +00:00
Nicolas Geoffray
d63481be77 Merge "Query the enable_apex_image flag from native experiment." am: ed74814369 
am: 32498c5c0c

Change-Id: Ic88bc7f8739358ff1777fbd659bf9a70e5bd2e99
 2019-02-26 02:26:00 -08:00
Nicolas Geoffray
7553f7ebef Merge "Replace generic GC type flag with a specific Generational CC flag." am: 77ad6aee15 
am: 2c2a2774d5

Change-Id: I7e05823618b1d1ceefa5553c4b7cc20674ae123d
 2019-02-26 02:19:44 -08:00
Nicolas Geoffray
ab33fcea7a Merge "Add a unit test for Android Runtime (Boot) device configuration flags." am: 6631e7c3a7 
am: 3fc88350ef

Change-Id: I50ecd962360ab6dcf99014fe1271091d497d491a
 2019-02-26 02:13:43 -08:00
Nicolas Geoffray
a1efcbfd95 Merge "Read "gctype" flag from namespace "runtime_native_boot"." am: 14a5cedfb5 
am: 396fbedfd4

Change-Id: I44e4d24549c52fa27496c1f1f653dd2296e60ce4
 2019-02-26 02:06:31 -08:00
Nicolas Geoffray
32498c5c0c Merge "Query the enable_apex_image flag from native experiment." 
am: ed74814369

Change-Id: I3a3a363a6f1d80368585294413219b4349309468
 2019-02-26 01:31:05 -08:00
Nicolas Geoffray
2c2a2774d5 Merge "Replace generic GC type flag with a specific Generational CC flag." 
am: 77ad6aee15

Change-Id: I44675d5fb088cebc01f75f7a176f42cd06d4f007
 2019-02-26 01:26:14 -08:00
Xiong Li
ad5037b91b Fix the build failure with enabling DEBUG_PSS 
frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java:2688:
error: variable pid might not have been initialized
    if (DEBUG_PSS) Slog.d(TAG_PSS, "Skipped pss collection of " + pid +

Bug: None
Test: make -j12
Change-Id: Ib668ba2606348f92239355b04039b45cae025cf3
 2019-02-26 17:23:23 +08:00
Nicolas Geoffray
3fc88350ef Merge "Add a unit test for Android Runtime (Boot) device configuration flags." 
am: 6631e7c3a7

Change-Id: I752cbbd3e8b948dfe1cd2bd972e5396fefa01242
 2019-02-26 01:21:27 -08:00
Nicolas Geoffray
396fbedfd4 Merge "Read "gctype" flag from namespace "runtime_native_boot"." 
am: 14a5cedfb5

Change-Id: Ic287ada0c1875d35c15a26455c05f75ceeb7c63a
 2019-02-26 01:16:13 -08:00
Colin Cross
2b626c7906 Merge "Convert FrameworksCoreTests to Android.bp" am: 5f912ecd06 
am: dc90eebeac

Change-Id: I8fedfd54da2910391763950aaf94825346eb9b6f
 2019-02-26 01:02:10 -08:00
Chiachang Wang
f6bfc13b5f Merge "Add more test case and some clean up" am: a0e4349794 
am: 2a93421b60

Change-Id: Iaf66ebc89188f0100bdc95fcc42574a4b1ad14fe
 2019-02-26 00:14:00 -08:00
Colin Cross
dc90eebeac Merge "Convert FrameworksCoreTests to Android.bp" 
am: 5f912ecd06

Change-Id: I137b1093db52608b06540a115051bec11398d58a
 2019-02-26 00:11:11 -08:00
Nicolas Geoffray
ed74814369 Merge "Query the enable_apex_image flag from native experiment." 2019-02-26 08:10:12 +00:00
Nicolas Geoffray
77ad6aee15 Merge "Replace generic GC type flag with a specific Generational CC flag." 2019-02-26 08:09:17 +00:00
Nicolas Geoffray
6631e7c3a7 Merge "Add a unit test for Android Runtime (Boot) device configuration flags." 2019-02-26 08:08:24 +00:00
Nicolas Geoffray
14a5cedfb5 Merge "Read "gctype" flag from namespace "runtime_native_boot"." 2019-02-26 08:07:54 +00:00
Nathan Harold
d211d9c80d Merge "Fix Order of Operations for Converting RSSI to ASU" am: 383624ffbf 
am: 8ef6d5e3e4

Change-Id: Ia0fb78846c2f343d47445edb9317cf26dec2dc1f
 2019-02-25 23:53:12 -08:00
Chen Xu
1d8be8bb80 Merge "getSimLocale should return locale rather than string tag" am: 7db49c554a 
am: 6841e3ce85

Change-Id: I5ddccb153bdbf7a34d03a2a511fb93cfa3522c62
 2019-02-25 23:43:20 -08:00
Chiachang Wang
2a93421b60 Merge "Add more test case and some clean up" 
am: a0e4349794

Change-Id: I14c74464877d58f74abab8914ac85aae435b7938
 2019-02-25 23:31:43 -08:00
Jordan Liu
a9ff4b51a9 Merge "CallAttributes uses the call network type" am: 0a04598a39 
am: f097910b87

Change-Id: Idb6d487bd77830ed849e4dda4eec3eaa2afcf48e
 2019-02-25 23:26:31 -08:00
Nathan Harold
8ef6d5e3e4 Merge "Fix Order of Operations for Converting RSSI to ASU" 
am: 383624ffbf

Change-Id: I6fb88ab51db1d8034c7d3822c072683adb2c3fd6
 2019-02-25 23:25:50 -08:00
Josh Gao
79e3be8a84 Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector. 
The previous implementation allocated an array of size
CMSG_SPACE(count) to store CMSG_LEN(count * sizeof(int)) elements, which
leads to bad things happening for values of count greater than 1 on
32-bit, and 2 on 64-bit.

Test: atest android.net.LocalSocketTest
Test: atest android.net.cts.LocalSocketTest
Change-Id: I0a9502c3358d8fa92d2d20e344c6270d6baedc07
 2019-02-25 23:21:23 -08:00
Chen Xu
6841e3ce85 Merge "getSimLocale should return locale rather than string tag" 
am: 7db49c554a

Change-Id: Ieceda5bc3321fa810a2b50e47410f1631aac7691
 2019-02-25 23:18:39 -08:00
Nicolas Geoffray
3b7debb0d6 Merge "Add gctype device config property for GC experiments" am: e24b30b7d4 
am: 5af7ce8d28

Change-Id: I7be7ab51b28eb99ed7229874a91a42f386547e1c
 2019-02-25 23:18:37 -08:00
Jordan Liu
f097910b87 Merge "CallAttributes uses the call network type" 
am: 0a04598a39

Change-Id: I05c392a2a53c295e1edca2341b2d618d5def0dc9
 2019-02-25 23:07:03 -08:00
Nicolas Geoffray
5af7ce8d28 Merge "Add gctype device config property for GC experiments" 
am: e24b30b7d4

Change-Id: I5c78c553e1bd1fe610e797c5f6ca4cc1a711721c
 2019-02-25 23:01:06 -08:00
Treehugger Robot
5f912ecd06 Merge "Convert FrameworksCoreTests to Android.bp" 2019-02-26 06:58:52 +00:00