Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
346,360 Commits 3 Branches 0 Tags
8d03a60930e2ab90ea3f97f1e2133aa87dd48919
Commit Graph

346360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
8d03a60930 Merge "Use assigned UUID for Hearing Aid Service" am: d310970d36 
am: 7f2091c522

Change-Id: I3e54498760d071a38d60467c2865a77374f8c928
 2018-02-26 19:31:12 +00:00
Jakub Pawlowski
7f2091c522 Merge "Use assigned UUID for Hearing Aid Service" 
am: d310970d36

Change-Id: I6b62de2142ba9957609aeb166574fd75bce83834
 2018-02-26 19:23:28 +00:00
Jakub Pawlowski
d310970d36 Merge "Use assigned UUID for Hearing Aid Service" 2018-02-26 18:12:26 +00:00
Jakub Pawlowski
5027679041 Use assigned UUID for Hearing Aid Service 
Test: manual
Bug: 64038649
Change-Id: Iab748db944df3bba8927973d0a55d95514b9f8ed
 2018-02-26 18:12:19 +00:00
Erik Kline
8ac26bad64 Merge "Slightly refactor IPv4 default router interface selection" am: 701421c6c9 
am: 95c373341e

Change-Id: I39795019a58b2c91bd427775e304e4b1b934db85
 2018-02-26 13:20:31 +00:00
Erik Kline
95c373341e Merge "Slightly refactor IPv4 default router interface selection" 
am: 701421c6c9

Change-Id: I1c8b9f95c8711c191e0e95cf72a5f4e5a3c3fc53
 2018-02-26 13:06:33 +00:00
Treehugger Robot
701421c6c9 Merge "Slightly refactor IPv4 default router interface selection" 2018-02-26 10:54:28 +00:00
Tetsutoki Shiozawa
89d30c03d0 Merge "Definitely abort reconnecting to native daemon during shutdown" am: 2fd5af1036 
am: 282c038240

Change-Id: I034072b89d0a8b9362940155ae2e2d173fde1b33
 2018-02-26 07:50:37 +00:00
Holly Jiuyu Sun
291f3f305c Merge "Add device capabilities." am: 86316a4b42 
am: 472d796ab2

Change-Id: I4837a521093dcc41bf7a3597d43c04e5f95c1c81
 2018-02-26 07:44:07 +00:00
Tetsutoki Shiozawa
282c038240 Merge "Definitely abort reconnecting to native daemon during shutdown" 
am: 2fd5af1036

Change-Id: I42d34accd9b56d1090a76632751447653cc8dd61
 2018-02-26 07:43:18 +00:00
Holly Jiuyu Sun
472d796ab2 Merge "Add device capabilities." 
am: 86316a4b42

Change-Id: I9aa51ecb8f3784e449b29358307646848ef3a309
 2018-02-26 07:35:22 +00:00
Treehugger Robot
2fd5af1036 Merge "Definitely abort reconnecting to native daemon during shutdown" 2018-02-26 06:49:52 +00:00
Holly Jiuyu Sun
86316a4b42 Merge "Add device capabilities." 2018-02-26 05:49:29 +00:00
Hugo Benichi
ca13c0553a Merge "Fix NPE in NetworkMetrics" am: cb0714332d 
am: 34d08160bd

Change-Id: I5c182e9cba857d291ea16fb8bd6b0a66d11cf432
 2018-02-24 19:21:43 +00:00
Hugo Benichi
34d08160bd Merge "Fix NPE in NetworkMetrics" 
am: cb0714332d

Change-Id: Icd844e6f04d93e9092b7fbf109ece537dfff4116
 2018-02-24 19:13:03 +00:00
Hugo Benichi
cb0714332d Merge "Fix NPE in NetworkMetrics" 2018-02-24 17:54:01 +00:00
tiansiming [田思明]
ef2ac4066b Merge "Let sendShowMessage called from hide to show" am: e7d04d728c 
am: f91fddddd1

Change-Id: I8aa277a5448b999496b79f6b5721738d3b5f9af7
 2018-02-24 02:56:15 +00:00
tiansiming [田思明]
f91fddddd1 Merge "Let sendShowMessage called from hide to show" 
am: e7d04d728c

Change-Id: If406d79d0489a9c61322c0937fce2c9a9a5c4dc1
 2018-02-24 02:43:03 +00:00
Ruchi Kandoi
21b4edb3cd Merge "Wrap raw binder interface into public classes" am: a4bde27012 
am: 3cd878df0f

Change-Id: I896528596006eb76241e706bb71d958214fb6499
 2018-02-24 02:04:37 +00:00
Ruchi Kandoi
3cd878df0f Merge "Wrap raw binder interface into public classes" 
am: a4bde27012

Change-Id: Idd3b7a5563b2432654af1a331a6f040c1e98832a
 2018-02-24 01:51:26 +00:00
Treehugger Robot
e7d04d728c Merge "Let sendShowMessage called from hide to show" 2018-02-24 01:27:13 +00:00
Treehugger Robot
a4bde27012 Merge "Wrap raw binder interface into public classes" 2018-02-24 00:19:29 +00:00
Holly Jiuyu Sun
aea22534eb Add device capabilities. 
Bug: 72223709
Test: Unit test
Merged-In: I35a74e88767f772f764734d1f535848ba43629b9
Change-Id: I35a74e88767f772f764734d1f535848ba43629b9
 2018-02-23 15:26:15 -08:00
Hugo Benichi
e73486bf24 Fix NPE in NetworkMetrics 
addTcpStatsResult() in NetworkMetrics was not checking for the nullness
of the pendingSummary object and trying to add stats regardless.

This patch fixes addTcpStatsResult() so that it populates pendingSummary
if necessary, similarly to addConnectResult() and addDnsResult()

Bug: 73825228
Test: runtest frameworks-net
Change-Id: I616a4be0e6e5920bd2f5c58292fea769bd516df7
 2018-02-24 08:01:30 +09:00
Erik Kline
e8bdb40057 Slightly refactor IPv4 default router interface selection 
Test: as follows
    - built
    - flashed
    - booted
    - USB tethering to dualstack wifi yields log lines like:

        14:33:31.970 - Looking for default routes on: {InterfaceName: wlan0 ...
        14:33:31.970 - IPv4/IPv6 upstream interface(s): wlan0/null

      and working tethering
    - runtest frameworks-net passes
Bug: 64380515
Bug: 64382985
Bug: 64976379
Change-Id: Iac94d870653ae1b71df00e8179cc4ecdb7ac412f
 2018-02-23 14:34:35 -08:00
Jeff Davidson
644c763b0d Merge "Factor out telephony permission checks into a helper class." am: fc5d8c8f31 
am: 5275c0b123

Change-Id: Ieedbcc2f40f70beb43cfb4d0e677d72f6b3ff8f5
 2018-02-23 21:33:07 +00:00
Jeff Davidson
5275c0b123 Merge "Factor out telephony permission checks into a helper class." 
am: fc5d8c8f31

Change-Id: I25cda3c74bb15d5a50414ecb5dbf788ce2d32828
 2018-02-23 21:24:36 +00:00
Andreas Gampe
dd531adbd2 Merge "Frameworks: Remove bogus test method" am: c65d52ff78 
am: 8120e8616b

Change-Id: I1dd4cb24ed7c5afdb9185bacabf7b0a3e8f3a7d8
 2018-02-23 21:15:06 +00:00
Andreas Gampe
8120e8616b Merge "Frameworks: Remove bogus test method" 
am: c65d52ff78

Change-Id: Iee4a75368b1f8d0cc9cc0594126f29acb0b5a5b7
 2018-02-23 21:08:46 +00:00
Jeff Davidson
fc5d8c8f31 Merge "Factor out telephony permission checks into a helper class." 2018-02-23 20:00:15 +00:00
Treehugger Robot
c65d52ff78 Merge "Frameworks: Remove bogus test method" 2018-02-23 19:28:55 +00:00
Jorim Jaggi
239d74fa19 Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c 
am: 94ec9e3e4b

Change-Id: I1391b28a04611f4e4445d53d3323fad8fb98528f
 2018-02-23 18:20:35 +00:00
Jorim Jaggi
94ec9e3e4b Merge "Don't wait keyguard drawn if device has no keyguard" 
am: a6e5165b2c

Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52
 2018-02-23 18:08:13 +00:00
Jack Yu
09da9870d0 Merge "Fixed service state CTS test failing" am: ab5bc3be50 
am: f535f8108d

Change-Id: Ia3e1e58acda7aa3099c93f1f6c2bef9f53828e4d
 2018-02-23 17:27:20 +00:00
Jack Yu
f535f8108d Merge "Fixed service state CTS test failing" 
am: ab5bc3be50

Change-Id: I38fc94d366a16acee810fd9336750044508cf766
 2018-02-23 17:18:49 +00:00
Pavlin Radoslavov
38c41a938f Merge "Removed executable flag for Java source files" am: 9a7c651196 
am: 9304dc9f36

Change-Id: I3123d49a045b91be0b1a22531110b069dfcf8890
 2018-02-23 16:35:36 +00:00
Pavlin Radoslavov
9304dc9f36 Merge "Removed executable flag for Java source files" 
am: 9a7c651196

Change-Id: Ia14ec1352400d603e51a3eaadd6d3910a10b6dc2
 2018-02-23 16:23:45 +00:00
Jorim Jaggi
a6e5165b2c Merge "Don't wait keyguard drawn if device has no keyguard" 2018-02-23 16:06:59 +00:00
Treehugger Robot
ab5bc3be50 Merge "Fixed service state CTS test failing" 2018-02-23 15:41:32 +00:00
Treehugger Robot
9a7c651196 Merge "Removed executable flag for Java source files" 2018-02-23 13:38:29 +00:00
Pavlin Radoslavov
155738ee1f Removed executable flag for Java source files 
Test: Code compilation
Change-Id: Ibfb57c6af54ace94eb9f9915471738f2f09ca70a
 2018-02-23 11:59:06 +00:00
Cassie
b1b06cbaf5 Merge "Add comments according to the API review process." am: e9a215b238 
am: b3b458b9ad

Change-Id: Ie9c3ce9bc67c08d99ea1c1ebfce5fbc78575baea
 2018-02-23 06:56:56 +00:00
Cassie
b3b458b9ad Merge "Add comments according to the API review process." 
am: e9a215b238

Change-Id: I3c079d96e4f8469b3e40eb7e5a9230544c752d57
 2018-02-23 06:45:24 +00:00
Treehugger Robot
e9a215b238 Merge "Add comments according to the API review process." 2018-02-23 05:32:35 +00:00
Andreas Gampe
336dd4c262 Frameworks: Remove bogus test method 
It's tripping Errorprone's JUnit3 test pattern.

Bug: 73797534
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ib0b9b342e085ba640d60e82ebd9a1bbb4fc4e916
 2018-02-22 21:25:25 -08:00
Erik Kline
d389a22391 Merge "Allow callers to synchronously block for shutdown" am: 9121322ce7 
am: a49db4d080

Change-Id: Icd7df06784a0ecf14c8b9b35d579179ffce65ffc
 2018-02-23 02:57:42 +00:00
Erik Kline
a49db4d080 Merge "Allow callers to synchronously block for shutdown" 
am: 9121322ce7

Change-Id: Ic0293bf12688e785f4942f0985a8470155fe062b
 2018-02-23 02:46:11 +00:00
Ruchi Kandoi
0b0b183f24 Wrap raw binder interface into public classes 
Test: Dummy application using the API
Bug: 73751309
Change-Id: If697100ed28b6b5217367d9988ed45f8baa14c34
 2018-02-22 16:59:36 -08:00
Andre Eisenbach
54f104e84c Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8 
am: 670ecc2279

Change-Id: I9a7a7712d750581cec4131489bca7071ad64ceee
 2018-02-22 23:02:15 +00:00
Andre Eisenbach
670ecc2279 Merge "Add AudioManager.setHearingAidDeviceConnectionState" 
am: c3e842fde8

Change-Id: I22a01bb4170b126c59593f938f95bf382beb3dd6
 2018-02-22 22:44:11 +00:00