Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
e40bb555d8 Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev 2016-12-13 00:27:35 +00:00
Jerry Zhang
830874dbe7 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." 
am: 1975240f17

Change-Id: I4b6532719b848ba4b595c8069ecbbd42e855382b
 2016-12-13 00:26:33 +00:00
Hugo Benichi
a61684feb4 DO NOT MERGE Logging improvements in CaptivePortalLoginActivity 
Logging improvements to help debugging captive portal issues.

Test: manually tested
Bug: 33126342

(cherry picked from commit 87de0c2067)

Change-Id: I3ac1773e07827194d854ebad4c27c48da106154b
 2016-12-13 09:26:22 +09:00
Hugo Benichi
d792f9d032 Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev 
* changes:
  DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
  DO NOT MERGE NetworkMonitor metrics: add first validation information
  DO NOT MERGE Captive portal systel log improvements
 2016-12-13 00:22:34 +00:00
Hugo Benichi
4efaee1d0f Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev 2016-12-13 00:21:47 +00:00
Treehugger Robot
ff93f927e4 Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." 2016-12-13 00:18:57 +00:00
TreeHugger Robot
f1b7718f4f Merge "libandroidfw: Make tests less flaky" 2016-12-13 00:16:08 +00:00
Jerry Zhang
1975240f17 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." 2016-12-13 00:12:04 +00:00
Winson Chung
7e3233a508 Only checking activity state to determine visibility when entering PiP. 
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I5ed05ef9bdb15dc7975bd83ac2e0f4020b148ea2
 2016-12-13 00:01:29 +00:00
Wale Ogunwale
5d7e7f136e Fixed window ordering issue with TYPE_VOICE_INTERACTION. 
WC.forAllWindows returns windows based on their token order in the
hierarchy and the non-app windows are ordered in the hierarchy based
on their types. For most window tokens their types is specified when
the token is added, but for some others we use the type of the first
window added to the token. This becomes a problem if various window
types are added to the same token (sys-ui I am looking at you...) and
someone adds another token with a window type that should be z-ordered
in-between the windows of the first token.
For now we work around the problem by collecting all the non-app windows
and making sure they are in order before return any window to the caller.
Long term we want to change sys-ui and other callers to use different
window tokens based on the window types they are adding.

Fixes: 33538278
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I83357975c87c704af9d0702c939ca99984462365
 2016-12-12 15:58:38 -08:00
Xiaohui Chen
576ea383b7 Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev am: f400349eb9 
am: fd155450eb

Change-Id: Ib7fcf85791f117c09603f471a350b9019c25a73d
 2016-12-12 23:53:36 +00:00
Xiaohui Chen
6d2e7ee49c sysui: add assets and dimentions for sw900dp am: 376b1756d4 
am: bb18d78ea1

Change-Id: I1340f23f5113c51b9fa1a34a5fab587aa44c8ecb
 2016-12-12 23:49:08 +00:00
Xiaohui Chen
fd155450eb Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev 
am: f400349eb9

Change-Id: Id12cf6f0ea67266f5ee63ea03910980a1211f36d
 2016-12-12 23:48:05 +00:00
Xiaohui Chen
bb18d78ea1 sysui: add assets and dimentions for sw900dp 
am: 376b1756d4

Change-Id: I4df31eea74b4978a4e8711730507e5d26877431d
 2016-12-12 23:42:50 +00:00
Xiaohui Chen
f400349eb9 Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev 2016-12-12 23:36:55 +00:00
Felipe Leme
8a511d50d7 Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am: d0fdf7aba3 -s ours am: 9f0030a98a -s ours am: edb11059e7 
am: 959f23f121  -s ours

Change-Id: I3ead232907bc9af7f409d6de6cfe10abc5479a1b
 2016-12-12 23:30:11 +00:00
Bill Yi
e6e588d21a Import translations. DO NOT MERGE 
Change-Id: Iac15928717cf7dc2caa8a2ed0c0e9fb7d6d09011
Auto-generated-cl: translation import
 2016-12-12 15:29:24 -08:00
sghuman
b191f3dc87 Merge "Fix erroneous constructor in ScoredNetwork.java" am: 9d55f43719 am: eaed9ef0b7 am: 60a850b670 
am: 3339d5b120

Change-Id: Id8966b9d9ba127fe043b6110cb5556f15c56de54
 2016-12-12 23:24:07 +00:00
Felipe Leme
959f23f121 Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am: d0fdf7aba3 -s ours am: 9f0030a98a -s ours 
am: edb11059e7

Change-Id: Ifbe3d0abcdfe61f519fd3dfe7727d430534b4f61
 2016-12-12 23:24:00 +00:00
sghuman
3339d5b120 Merge "Fix erroneous constructor in ScoredNetwork.java" am: 9d55f43719 am: eaed9ef0b7 
am: 60a850b670

Change-Id: I2c3de5b2cb0d60fc4aef08256939b50e67d7aa53
 2016-12-12 23:18:31 +00:00
Felipe Leme
edb11059e7 Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am: d0fdf7aba3 -s ours 
am: 9f0030a98a  -s ours

Change-Id: Ifd564eb7e8260b0642805abf4621d77c0381a5a2
 2016-12-12 23:18:29 +00:00
sghuman
60a850b670 Merge "Fix erroneous constructor in ScoredNetwork.java" am: 9d55f43719 
am: eaed9ef0b7

Change-Id: I0314c02497dcabd6f3fa1caeb665ff5ecb9a0f59
 2016-12-12 23:12:36 +00:00
Felipe Leme
9f0030a98a Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." 
am: d0fdf7aba3  -s ours

Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76
 2016-12-12 23:12:25 +00:00
Wale Ogunwale
72919d2c31 Untangle creation of Task from addition of AppToken in WM. 
Makes it easier to follow what is going on and also clean-up in
preparation of stand way for AM to interact with containers in WM.

Test: Existing tests pass and manual testing
Change-Id: I91754b6d974dce2f696453cdaed175efb0f10c73
 2016-12-12 15:09:03 -08:00
sghuman
eaed9ef0b7 Merge "Fix erroneous constructor in ScoredNetwork.java" 
am: 9d55f43719

Change-Id: I6f24c92a9638f91197a4d17bfdc3fbeeede3daf4
 2016-12-12 23:07:22 +00:00
Treehugger Robot
d0fdf7aba3 Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." 2016-12-12 23:00:18 +00:00
Sundeep Ghuman
46169f946b Copy WifiNetworkScoreCache into frameworks/base. Add tests. 
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java

Bug: b/33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
 2016-12-12 14:57:10 -08:00
sghuman
9d55f43719 Merge "Fix erroneous constructor in ScoredNetwork.java" 2016-12-12 22:53:19 +00:00
Sundeep Ghuman
23f98ebe33 Fix erroneous constructor in ScoredNetwork.java 
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
 2016-12-12 14:36:03 -08:00
Felipe Leme
5ae2cd5d76 DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4. 
BUG: 30839080
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

(cherry picked from Ic192334389eed7596e1f7cb8ce98a5169262418c)

Change-Id: I90cf55ad948bbe0883473431f40201cf4206dc82
 2016-12-12 14:19:25 -08:00
Felipe Leme
4ef40087be DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest. 
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.

This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.

Bug: 30764608
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

(cherry picked from commit I53ff86fc9b64cb058846f1aefa244771630d9e1e)

Change-Id: Ia9cdb780cb0917477b310dc38d2e39731d6a7609
 2016-12-12 14:18:39 -08:00
TreeHugger Robot
99314b321a Merge "init.start was renamed to ro.boottime.init" 2016-12-12 22:17:47 +00:00
Adam Lesinski
351471f928 libandroidfw: Make tests less flaky 
Changing any of the test APKs could change resource IDs.
The resource IDs are all made public and assigned an ID
to avoid this issue.
Test: make libandroidfw_tests

Change-Id: Idd17c25f4ac86a0ad5b2b8da6f968e5d9b2346c1
 2016-12-12 14:10:46 -08:00
Marie Janssen
2057b6e87d Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0 -s ours am: 964f769d63 -s ours am: 2e4d0c765f 
am: 33e5e06c23  -s ours

Change-Id: Iaa38e70d9bb19d29e813d8e18d0a9af8ff273974
 2016-12-12 21:51:46 +00:00
Marie Janssen
33e5e06c23 Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0 -s ours am: 964f769d63 -s ours 
am: 2e4d0c765f

Change-Id: I8a68cdea6ec1e227ac3b179b8b82221a38365f0c
 2016-12-12 21:46:06 +00:00
Joe LaPenna
fdff93052e Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601 am: b52989c736 
am: b0977f52a6

Change-Id: I3c1db8b94e35bc4bb3df17fa2e6e1a3af6683e4a
 2016-12-12 21:45:58 +00:00
jackqdyulei
f9c6d8d69b Remove qs_detail_empty and use colorForeground instead. 
Bug: 33356706
Test: Manual
Change-Id: I3cdecf59488b61de989315041ac374d5ec963233
 2016-12-12 13:45:01 -08:00
TreeHugger Robot
cf4d2ce358 Merge "Introduce TextClassificationManager." 2016-12-12 21:42:19 +00:00
Bill Yi
8266445d2c Import translations. DO NOT MERGE 
Change-Id: I1b6a43dcf3e5d9104f2eb3c911c29585bfdccd15
Auto-generated-cl: translation import
 2016-12-12 13:41:01 -08:00
Marie Janssen
2e4d0c765f Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0 -s ours 
am: 964f769d63  -s ours

Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e
 2016-12-12 21:40:10 +00:00
Joe LaPenna
b0977f52a6 Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601 
am: b52989c736

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
 2016-12-12 21:39:55 +00:00
Dmitri Plotnikov
190495a690 Merge "Adding "quiescent" reboot mechanism to support STB operators" 2016-12-12 21:37:33 +00:00
Marie Janssen
964f769d63 Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" 
am: 47e1f497c0  -s ours

Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490
 2016-12-12 21:34:39 +00:00
Joe LaPenna
b52989c736 Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 
am: 2bc66bf601

Change-Id: Idaa23641c8e95890271c554dee0244702601a109
 2016-12-12 21:34:30 +00:00
Joe LaPenna
2bc66bf601 Merge "Add simplified_network_settings_bool to CarrierConfigManager." 
am: 9b430e0395

Change-Id: Ib14979d168f4e37ab2f8de0737abe94cc6c8b16d
 2016-12-12 21:28:29 +00:00
Marie Janssen
47e1f497c0 Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" 2016-12-12 21:27:23 +00:00
Chris Craik
7a5ad26406 Merge "Add Outline/RenderNode perf tests" 2016-12-12 21:15:09 +00:00
Treehugger Robot
9b430e0395 Merge "Add simplified_network_settings_bool to CarrierConfigManager." 2016-12-12 21:14:57 +00:00
Jerome Gaillard
3be8766edc Merge "Fix path to JUnit jar for IDEA module in layoutlib" 2016-12-12 21:13:26 +00:00
TreeHugger Robot
7a7c921e18 Merge "Add more Skia pipeline unit tests." 2016-12-12 20:59:45 +00:00