Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
381,475 Commits 3 Branches 0 Tags
b0affe21006d178fde07369fcd034221dccb18a8
Commit Graph

381475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
b0affe2100 Merge "Move default sounds to /product" am: 6feab6bf6c 
am: d60c748952

Change-Id: I7db05bc821316ac046f125c42ea332051c1f2f69
 2019-01-08 00:36:18 -08:00
Anton Hansson
d60c748952 Merge "Move default sounds to /product" 
am: 6feab6bf6c

Change-Id: I36f9e88d465dcf0417ea73e5e3bfbd9c38bb1398
 2019-01-08 00:27:02 -08:00
Chalard Jean
0b08cd3e1a Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db 
am: 59c8590f7b

Change-Id: If2e704e1f8ddf504be9e777ec226b2ce524438dc
 2019-01-08 00:19:52 -08:00
Anton Hansson
6feab6bf6c Merge "Move default sounds to /product" 2019-01-08 08:17:55 +00:00
Chalard Jean
59c8590f7b Merge "Add nullability annotations to public methods of ConnManager." 
am: 805e2ad9db

Change-Id: I8f5cc35869b4b76404190709206cccd895a1d4b4
 2019-01-08 00:10:38 -08:00
Chalard Jean
805e2ad9db Merge "Add nullability annotations to public methods of ConnManager." 2019-01-08 07:58:13 +00:00
Jack Yu
cbdc0f57f9 Merge "Cleaned up dead code" am: d5a744abb6 
am: c5aa9448a7

Change-Id: Ibab85fe8fcfab852d1f761749135e61dd7dfe7e7
 2019-01-07 23:03:07 -08:00
Jack Yu
c5aa9448a7 Merge "Cleaned up dead code" 
am: d5a744abb6

Change-Id: Ie70c6186ea81b5066f821b5d9f818f39b2e8282e
 2019-01-07 22:53:29 -08:00
Treehugger Robot
d5a744abb6 Merge "Cleaned up dead code" 2019-01-08 06:36:18 +00:00
Remi NGUYEN VAN
833d541de5 Merge "Fix linter errors in NetworkMonitor" am: 2e1d80d4e7 
am: 81554a871b

Change-Id: I615c133c5559731f249640151d2b82e357e38807
 2019-01-07 22:08:03 -08:00
Remi NGUYEN VAN
c922a83872 Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393 
am: 4adb05b6b0

Change-Id: Ie3d6285fa7da96fee10028b38aa6c5a8d5c85c48
 2019-01-07 22:02:27 -08:00
Remi NGUYEN VAN
81554a871b Merge "Fix linter errors in NetworkMonitor" 
am: 2e1d80d4e7

Change-Id: Ic0ba68f6dcc9cddb81641663c4a9961917f845d2
 2019-01-07 21:50:54 -08:00
Remi NGUYEN VAN
4adb05b6b0 Merge "Fix linter errors in IpServer and its dependencies" 
am: a9be76c393

Change-Id: Id21d01f146febdc4f156c4a8c0f439e21301d3a9
 2019-01-07 21:46:53 -08:00
liulvping
be2b5dab88 Merge "fix mmap leak of graphicsstats service" am: 9ebc299b73 
am: a2b2a415f0

Change-Id: I9da0210799cee14bb36afd186d26fbb1718ffc19
 2019-01-07 21:36:12 -08:00
Remi NGUYEN VAN
2e1d80d4e7 Merge "Fix linter errors in NetworkMonitor" 2019-01-08 05:33:45 +00:00
Remi NGUYEN VAN
a9be76c393 Merge "Fix linter errors in IpServer and its dependencies" 2019-01-08 05:32:26 +00:00
liulvping
a2b2a415f0 Merge "fix mmap leak of graphicsstats service" 
am: 9ebc299b73

Change-Id: I6d13762a54bcf7417379c67385848e81e953ff2b
 2019-01-07 21:22:46 -08:00
Treehugger Robot
9ebc299b73 Merge "fix mmap leak of graphicsstats service" 2019-01-08 05:03:47 +00:00
Remi NGUYEN VAN
8708d842fb Fix linter errors in NetworkMonitor 
The fixes are necessary to move the class to packages/NetworkStack.

Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I1fe42d9edf4cc86de1b9c75808407183e23a87e2
 2019-01-08 13:23:36 +09:00
Remi NGUYEN VAN
815bd36c07 Merge "Add parceling for DhcpServingParams" am: f6209cf0dd 
am: 133f281d12

Change-Id: Icab36165187d204de5fdbc4f4271e758ebaebed8
 2019-01-07 18:16:49 -08:00
Remi NGUYEN VAN
73105e1143 Fix linter errors in IpServer and its dependencies 
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I534b391458433ac24dffe78f287e3c83a264acfd
 2019-01-08 11:07:58 +09:00
Remi NGUYEN VAN
133f281d12 Merge "Add parceling for DhcpServingParams" 
am: f6209cf0dd

Change-Id: I3462d829ea5aca3e2d8a76db3c522f355da36153
 2019-01-07 18:07:51 -08:00
Remi NGUYEN VAN
f6209cf0dd Merge "Add parceling for DhcpServingParams" 2019-01-08 01:53:19 +00:00
Android Build Merger (Role)
917d0658b5 Merge "[automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 4e3507d544 -s ours am: b59effc883" into pi-dev-plus-aosp 2019-01-08 01:32:04 +00:00
Abodunrinwa Toki
0bcdd90d61 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 4e3507d544 -s ours 
am: b59effc883

Change-Id: I397e10a287790e2054dbeae97ed0109236c6b906
 2019-01-07 17:31:42 -08:00
Chih-hung Hsieh
c545d54389 Merge "Fix/suppress hwui/tests google-explicit-constructor warnings" am: 6832595911 
am: 0e0edd08ac

Change-Id: I8199a26c717fe80b3a733d796b85f28d3acc25a9
 2019-01-07 17:29:54 -08:00
Abodunrinwa Toki
b59effc883 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. 
am: 4e3507d544 -s ours
am skip reason: subject contains skip directive

Change-Id: I8415feaa840b6a4c925ec87b4d2e2aed8981037e
 2019-01-07 17:23:59 -08:00
Chih-hung Hsieh
0e0edd08ac Merge "Fix/suppress hwui/tests google-explicit-constructor warnings" 
am: 6832595911

Change-Id: Iffb7f6fc3e829d8ebdb97d7e1a98e823a6ad5b44
 2019-01-07 17:15:42 -08:00
Abodunrinwa Toki
adcd10f10f RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. 
am: a69950ce18

Change-Id: I0830e1c1a1cea2fd93f0b1ed8a1a792260201bb2
 2019-01-07 17:10:30 -08:00
Jack Yu
c9e3eef543 Cleaned up dead code 
Cleaned up dead code and simplified code path.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Change-Id: I0c066d59f2fde9af315f4dabe0fe7b55600fa9f8
 2019-01-07 16:54:16 -08:00
Chih-hung Hsieh
6832595911 Merge "Fix/suppress hwui/tests google-explicit-constructor warnings" 2019-01-08 00:29:21 +00:00
Andreas Gampe
7ae1e84f61 Merge "NetworkPolicy: Replace fake allLocks" am: 1afa2c413e 
am: bd37561226

Change-Id: I1e77ef4a361d7167c1336fb15563fbb036463713
 2019-01-07 10:37:14 -08:00
Andreas Gampe
bd37561226 Merge "NetworkPolicy: Replace fake allLocks" 
am: 1afa2c413e

Change-Id: Iff90737a3d2ade86e8cbf7ac1a2663c4e886e285
 2019-01-07 10:27:15 -08:00
Andreas Gampe
1afa2c413e Merge "NetworkPolicy: Replace fake allLocks" 2019-01-07 18:10:15 +00:00
Eric Holk
c31debe037 Merge "[view compiler] Add XML to DEX compilation" am: d426ee84a0 
am: 755467bb4f

Change-Id: I32e325db7d9176910e271b721c0adf1b98d1a688
 2019-01-07 10:08:49 -08:00
Eric Holk
755467bb4f Merge "[view compiler] Add XML to DEX compilation" 
am: d426ee84a0

Change-Id: I095a2113ea714a66bcca915dee076aa20a908f31
 2019-01-07 09:53:41 -08:00
Treehugger Robot
d426ee84a0 Merge "[view compiler] Add XML to DEX compilation" 2019-01-07 17:43:50 +00:00
Jack Yu
4d3d43d006 Merge "Stop exposing reasons through phone state listener" am: 26ebccdcff 
am: d05f403adc

Change-Id: I12080acebc37dc496f9b016784fc8ef6e611f1d4
 2019-01-07 07:54:34 -08:00
Jack Yu
d05f403adc Merge "Stop exposing reasons through phone state listener" 
am: 26ebccdcff

Change-Id: I81f44a4c127309e7358d4aadb6148d6448ff55a6
 2019-01-07 07:45:01 -08:00
Jack Yu
26ebccdcff Merge "Stop exposing reasons through phone state listener" 2019-01-07 15:25:38 +00:00
Anton Hansson
5113c0cf17 Move default sounds to /product 
The set of audio files is frequently customized, so move the default
set to /product. The frameworks scans both of these directories.

Bug: 80410283
Bug: 118826166
Test: verify sounds available in soundpicker
Change-Id: I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a
Merged-In: I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a
 2019-01-07 14:16:52 +00:00
Chalard Jean
50bea3d084 Add nullability annotations to public methods of ConnManager. 
This is mainly for Kotlin compatibility.
https://android-developers.googleblog.com/2018/08/android-pie-sdk-is-now-more-kotlin.html

Bug: 122437895
Test: no logic changes
Change-Id: Ic1b9a774aee0099397b1ccfd958ff3b61d69a7fb
 2019-01-07 19:35:09 +09:00
Jack Yu
084b7f514f Merge "Cleaned up dead code" am: d14ed44c52 
am: bcea94219a

Change-Id: Ic3701fac667f51f1ab8faef451355fff4ac97249
 2019-01-06 22:58:29 -08:00
Jack Yu
bcea94219a Merge "Cleaned up dead code" 
am: d14ed44c52

Change-Id: I2b28c73090b0a1a9a15e4a104acdbca7e43abecf
 2019-01-06 22:49:13 -08:00
Jack Yu
f05919ab76 Stop exposing reasons through phone state listener 
The data connection reasons are implementation details
of telephony and should not be exposed externally. The
data connection fail cause, which is different from
reasons, are still available.

Test: Telephony sanity tests + unit tests
Bug: 73659459

Merged-In: Ia005abf19664e6213118ee932495950af118456d
Change-Id: Ia005abf19664e6213118ee932495950af118456d
(cherry picked from commit 4d1c945000)
 2019-01-07 06:39:38 +00:00
Jack Yu
d14ed44c52 Merge "Cleaned up dead code" 2019-01-07 06:37:30 +00:00
Manpreet
e9fe937245 Merge "Null locale causing the VTS fail." am: 179f30a443 
am: 9568191633

Change-Id: Iab284dfc831a9079e339c8c23fba8f3e7e4ec04d
 2019-01-06 20:44:13 -08:00
Manpreet
9568191633 Merge "Null locale causing the VTS fail." 
am: 179f30a443

Change-Id: I8ae92392e70c046194df1c8ebee0bd32ed9513cf
 2019-01-06 20:30:46 -08:00
Treehugger Robot
179f30a443 Merge "Null locale causing the VTS fail." 2019-01-07 04:19:22 +00:00
Remi NGUYEN VAN
761198a05d Add parceling for DhcpServingParams 
Introduce a stable AIDL parcel class, DhcpServingParamsParcel, and
methods to convert to and from that class to DhcpServingParams.
This will be used to move DhcpServer to the NetworkStack app.

Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I276b7affccb938059769c90a53f0f6beb26e6ede
 2019-01-07 12:07:18 +09:00