Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
377,281 Commits 3 Branches 0 Tags
8217d911cccd0ffd4a045f3c8787df7f009e3191
Commit Graph

377281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
8217d911cc Merge "Call clearSettingsProvider before and after test" am: 3868fc30ee 
am: ee1cde53de

Change-Id: I21123baaa211d19af181c970b7ad85051c7d08b7
 2018-09-28 07:40:45 -07:00
Remi NGUYEN VAN
ee1cde53de Merge "Call clearSettingsProvider before and after test" 
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0
 2018-09-28 07:28:31 -07:00
Treehugger Robot
3868fc30ee Merge "Call clearSettingsProvider before and after test" 2018-09-28 14:06:36 +00:00
Nicolas Geoffray
5a0ffc6ae3 Merge "Add new DelegateLastClassLoader API" am: 1a9013a51c 
am: d899c263b8

Change-Id: I937d77a969492087d21a6cf2ec542e3b4372e1eb
 2018-09-28 06:12:44 -07:00
Nicolas Geoffray
658dbeddce Merge "Add new DelegateLastClassLoader API" 
am: 1a9013a51c

Change-Id: I82cd751e2c395b0e0f592434c5db219e0117f71e
 2018-09-28 06:07:29 -07:00
Nicolas Geoffray
9a2b31c832 Add new DelegateLastClassLoader API 
am: dcb9e663be

Change-Id: I49e7682496aa55e234890b7e377059f943addea6
 2018-09-28 06:03:25 -07:00
Nicolas Geoffray
d899c263b8 Merge "Add new DelegateLastClassLoader API" 
am: 1a9013a51c

Change-Id: Ic4d4d95eadd175421743ddfda361aa0d9b951c5b
 2018-09-28 05:53:22 -07:00
Nicolas Geoffray
1a9013a51c Merge "Add new DelegateLastClassLoader API" 2018-09-28 12:12:12 +00:00
Remi NGUYEN VAN
91a1cc111c Call clearSettingsProvider before and after test 
FakeSettingsProvider requires this method to be called before and after
use. Without this, the settings value or content provider may be cached
statically, so the test will be affected by code accessing settings
before it is run.

Bug: b/116668105
Test: atest FrameworksNetTests
Change-Id: I1480f3f3bbb17791752582a70327bb5c7c348d7c
 2018-09-28 14:46:34 +09:00
Remi NGUYEN VAN
df7154793b Merge "Don't throw a NPE in SharedLog#e" am: bc5c593e2e 
am: 812286cd84

Change-Id: I6656b30168ab78970cdbcf5d04b4be96303a0040
 2018-09-27 18:36:46 -07:00
Remi NGUYEN VAN
812286cd84 Merge "Don't throw a NPE in SharedLog#e" 
am: bc5c593e2e

Change-Id: Ibe40285165474b2d630a68a43ac82b43411f8bfc
 2018-09-27 18:29:35 -07:00
Amith Yamasani
0631cca3ff Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev 
am: 311f0f5da5

Change-Id: I941f1a8f9b6ee2c65ee289a159146d5b2ee95dcc
 2018-09-27 18:11:46 -07:00
Remi NGUYEN VAN
bc5c593e2e Merge "Don't throw a NPE in SharedLog#e" 2018-09-28 01:08:59 +00:00
TreeHugger Robot
311f0f5da5 Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev 2018-09-28 00:50:39 +00:00
Nathan Harold
353d7558b9 Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843 
am: b4b64bbbdd

Change-Id: Ic2bcbc4e0ed9a0154699da43b504c93847f4b513
 2018-09-27 17:28:05 -07:00
Nathan Harold
b4b64bbbdd Merge "Catch IllegalArgumentException on NetworkScan.stopScan" 
am: 84c2b6a843

Change-Id: I6d6bdd04eaceeb3dcb1e19487a7c4c44d3b08ec4
 2018-09-27 17:13:12 -07:00
Nathan Harold
84c2b6a843 Merge "Catch IllegalArgumentException on NetworkScan.stopScan" 2018-09-27 23:55:01 +00:00
David Castro
6c758e81cb Merge "docs: Updates the documentation for the wepKeys field." into pi-dev 
am: 61a4d35100

Change-Id: I9f5ad3998d97b740e07b8e4345b22108245ee5ae
 2018-09-27 15:15:16 -07:00
TreeHugger Robot
61a4d35100 Merge "docs: Updates the documentation for the wepKeys field." into pi-dev 2018-09-27 21:55:04 +00:00
Xiangyu/Malcolm Chen
d6b4d9379e Merge "Implement equal method in SubscriptionInfo." am: e0ae5ff8cc 
am: 9bb8d34a9e

Change-Id: I026607617e3270c36ada51cd282f288d4cc8614c
 2018-09-27 14:17:00 -07:00
Xiangyu/Malcolm Chen
9bb8d34a9e Merge "Implement equal method in SubscriptionInfo." 
am: e0ae5ff8cc

Change-Id: I7a57debfd4b07a6a61595da656944295a5fe955e
 2018-09-27 14:08:37 -07:00
Xiangyu/Malcolm Chen
e0ae5ff8cc Merge "Implement equal method in SubscriptionInfo." 2018-09-27 20:51:00 +00:00
kopriva
e052af447d Merge "docs: fix bug 37054309, becuase typo" into pi-dev 
am: 9359f3683c

Change-Id: I8ba3e3bd1d6aa296f216343d78cc252385ba64ba
 2018-09-27 13:24:29 -07:00
TreeHugger Robot
9359f3683c Merge "docs: fix bug 37054309, becuase typo" into pi-dev 2018-09-27 20:03:29 +00:00
Malcolm Chen
3c758b701c Implement equal method in SubscriptionInfo. 
Bug: 115541873 92796390
Test: manual with test app
Change-Id: I217f9d612df5cecac8f0359649f3e79a60a95dde
Merged-In: I217f9d612df5cecac8f0359649f3e79a60a95dde
 2018-09-27 11:59:31 -07:00
Lalit Maganti
6180735106 DO NOT MERGE Revert "new System API for preferred network mode" 
This reverts commit 8a8832fd81.

Reason: most of the users in this new API are not in pi-dev so this change does
not make sense in this branch.

Change-Id: I73b7834916b4f45017010c45e96ea2538e952443
 2018-09-27 18:44:16 +00:00
Nathan Harold
ce40801ef5 Catch IllegalArgumentException on NetworkScan.stopScan 
IllegalArgumentException is thrown when a terminated
scan calls stop. This change softens the exception and
error type that is logged and considers this normal.

Bug: 113823866
Test: compilation
Change-Id: I7ce60d6badfac52156cceca83b39c1afe21b4eda
 2018-09-27 11:17:22 -07:00
kopriva
7364c11185 docs: fix bug 37054309, becuase typo 
Test: make ds-docs

Bug: 37054309

Change-Id: I726ed84d62df4036cc274c48ae2f6968f2b7cc3f
Exempt-From-Owner-Approval: Docs-only change
 2018-09-27 11:02:07 -07:00
Lalit Maganti
ce30e31664 Merge "Revert "Revert "new System API for preferred network mode""" am: c5a1a5e543 
am: b65be923cb

Change-Id: I68546e0c0cbd8c2ec9606b4fd064f9e31083eb05
 2018-09-27 09:10:05 -07:00
Lalit Maganti
81dfe744d6 resolve merge conflicts of 0cb277ef87 to pi-dev-plus-aosp 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd
 2018-09-27 16:43:27 +01:00
Lalit Maganti
b65be923cb Merge "Revert "Revert "new System API for preferred network mode""" 
am: c5a1a5e543

Change-Id: Ib740d7d217b33e3e5d9217eeb598c42341ed75a7
 2018-09-27 08:37:50 -07:00
Lalit Maganti
0cb277ef87 resolve merge conflicts of ee5fc8831e to stage-aosp-master 
Change-Id: Ibb00c2eb1e27914b361398c064715169d38a01fd
 2018-09-27 16:28:57 +01:00
Lalit Maganti
c5a1a5e543 Merge "Revert "Revert "new System API for preferred network mode""" 2018-09-27 15:00:12 +00:00
Lalit Maganti
70534bf1be Revert "Revert "new System API for preferred network mode"" 
This reverts commit dada4c60d8.

Reason for revert: Breaking aosp-master builds.

Change-Id: Ie48b2125025878ce13953706a7eec24bce38594b
 2018-09-27 14:57:06 +00:00
Jean-Michel Trivi
ee5fc8831e Merge "Make pre-scale for absolute volume configurable" 2018-09-27 14:35:13 +00:00
Lalit Maganti
81462faf05 Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 
am: 164774b7bb

Change-Id: I6f825cf29b11a6b212e5beb163fed01f063befc0
 2018-09-27 06:52:40 -07:00
Lalit Maganti
164774b7bb Merge "Revert "new System API for preferred network mode"" 
am: 4106e419b2

Change-Id: Ifa5956f28ae3581e96f4e9be81cde5c54ddeeedd
 2018-09-27 06:34:08 -07:00
Lalit Maganti
4106e419b2 Merge "Revert "new System API for preferred network mode"" 2018-09-27 12:17:40 +00:00
Lalit Maganti
dada4c60d8 Revert "new System API for preferred network mode" 
This reverts commit 8a8832fd81.

Reason for revert: Causing failures on git_pi-dev-plus-aosp for docs and aosp_sailfish.

Change-Id: I1801188e66420a67244b3223e26334c4650d56be
Merged-In: Ic108c484905f80783982a22e8152609257d684b5
 2018-09-27 10:52:55 +00:00
Calin Juravle
ade4132e1c Merge "Fix trial run in AppLaunch test" am: 3e83b4cad8 
am: fdbf99782e

Change-Id: I8f5fc7afb3c514ab862a3a99d3f93e77f65d698a
 2018-09-26 21:34:41 -07:00
Calin Juravle
fdbf99782e Merge "Fix trial run in AppLaunch test" 
am: 3e83b4cad8

Change-Id: Ia7d8b3d41614dc09c68e4fdae05934c5f1f9e4c7
 2018-09-26 21:19:11 -07:00
Remi NGUYEN VAN
f5d65c521c Don't throw a NPE in SharedLog#e 
Some DhcpServer error code paths could cause a NPE, when the logError
callback was called without an exception. Allowing SharedLog#e to be
called with a null Throwable is less error-prone.

Bug: b/109584964
Test: atest FrameworksNetTests
Change-Id: Idbcdd330a9d1951b27aaf525aaf12e52e102872c
 2018-09-27 12:20:15 +09:00
Treehugger Robot
3e83b4cad8 Merge "Fix trial run in AppLaunch test" 2018-09-27 02:20:30 +00:00
Chen Xu
d2bd668324 Merge "new System API for preferred network mode" am: 314dcd2874 
am: 4560dbd05a

Change-Id: I43b606e03b9c3276ba7996a5f7feede5d31c0b01
 2018-09-26 17:58:00 -07:00
Chen Xu
4560dbd05a Merge "new System API for preferred network mode" 
am: 314dcd2874

Change-Id: Ic1c8588f2d6d200adba6dcb10c2f991eeff630de
 2018-09-26 17:42:58 -07:00
Chen Xu
314dcd2874 Merge "new System API for preferred network mode" 2018-09-27 00:30:29 +00:00
Jordan Liu
023c48e92b Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af 
am: 737945fbd5

Change-Id: I38e3374723e4e756688eb3572cffc59834924625
 2018-09-26 17:22:24 -07:00
Jordan Liu
737945fbd5 Merge "Dismiss SIM lock page after correct SIM" 
am: eb1d6d91af

Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b
 2018-09-26 17:09:44 -07:00
Tomoharu Kasahara
85b8c1fcf0 Make pre-scale for absolute volume configurable 
Audio gain for lower volume steps are restricted for
Bluetooth Absolute Volume scenario, but it's better
not to use the fixed value.
This CL makes it possible to configure the value of
pre-scale.

Bug: 114220617
Test: manual - gain is restricted as per the configuration

Change-Id: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
Merged-In: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
 2018-09-27 08:50:07 +09:00
Jordan Liu
eb1d6d91af Merge "Dismiss SIM lock page after correct SIM" 2018-09-26 23:42:55 +00:00