drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
315,693 Commits 1 Branch 0 Tags
Commit Graph

315693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
1d3528ba86 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c 
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
 2017-04-13 06:12:30 +00:00
Erik Kline
1303b8b9ca Merge "Ignore potential SystemProperties errors when setting net.dns" 
am: f854c9034c

Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
 2017-04-13 06:00:37 +00:00
Lorenzo Colitti
7586a5e4bc Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 am: 997e6b085a 
am: 42f7ca684c

Change-Id: I94265917ea58b78c3ee56ee89f99c0af307b7fe2
 2017-04-13 05:54:27 +00:00
Treehugger Robot
f854c9034c Merge "Ignore potential SystemProperties errors when setting net.dns" 2017-04-13 05:49:31 +00:00
Lorenzo Colitti
42f7ca684c Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 
am: 997e6b085a

Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
 2017-04-13 05:48:37 +00:00
Bill Yi
3b1e4d3e86 Import translations. DO NOT MERGE 
Change-Id: I4d7599fdee360cf86ce1980b9759a692a493d21b
Auto-generated-cl: translation import
 2017-04-12 22:38:20 -07:00
Lorenzo Colitti
997e6b085a Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b 
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
 2017-04-13 05:37:01 +00:00
Bill Yi
080b410086 Import translations. DO NOT MERGE 
Change-Id: I7e1162b350c7337fded998a04ba80d20043dd39d
Auto-generated-cl: translation import
 2017-04-12 22:34:29 -07:00
Winson Chung
3f103eb430 Fix issue with non-focusable PiP activities being resumed. 
- When the change to finish activities was made in ag/2067154, it exposed
  an issue in pinned stacks where we would resume the next top activity
  once the top activity finished pausing. Normally, the pinned stack is
  not focusable, but since it has an alwaysFocusable menu activity it
  becomes the focused stack and falls into this case.

  Instead of finding the next top activity, we need to find the next top
  focusable activity to resume, and fall through to focusing the top
  activity in the next focusable stack if there is none.

Bug: 37199067
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testNoResumeAfterTaskOverlayFinishes
Change-Id: Ib79826ff38bb3beb38a40183ddc6819e5040bb27
 2017-04-12 22:31:12 -07:00
Lorenzo Colitti
67401e25c2 Merge "Move some NetworkStats tests to tests/net." 
am: ab3901dc8b

Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
 2017-04-13 05:29:58 +00:00
Lorenzo Colitti
ab3901dc8b Merge "Move some NetworkStats tests to tests/net." 2017-04-13 05:18:47 +00:00
Daichi Hirono
a5e04889ee Merge "Use Context#startForegroundService in MTP provider" into oc-dev am: 96907e6553 
am: 1737e10334

Change-Id: I9eba75fb2af47cccb2bec9d71adc258bb5296ebd
 2017-04-13 04:47:53 +00:00
Daichi Hirono
1737e10334 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 
am: 96907e6553

Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
 2017-04-13 04:42:22 +00:00
Robert Carr
af422a8c5b Stack APPLICATION_MEDIA_OVERLAY windows with relative layering. 
See accompanying frameworks/native commit
 "SurfaceFlinger: Add parent-less relative layering" for a full explanation.

Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug: 36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
 2017-04-12 21:40:30 -07:00
TreeHugger Robot
96907e6553 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 2017-04-13 04:36:50 +00:00
Bill Yi
7dc403b158 Import translations. DO NOT MERGE 
Change-Id: I140e40e34c4ee3482c87f180d292bdba8594961b
Auto-generated-cl: translation import
 2017-04-12 21:31:16 -07:00
Fyodor Kupolov
0c48ce1309 Merge "Report app data fixup and prepare timings" into oc-dev am: 1423ea3a45 
am: 9f3cf1a692

Change-Id: I81dfcf98097d356e53994ba7ffaf247618349304
 2017-04-13 04:24:51 +00:00
Erik Kline
4edba01eb4 Ignore potential SystemProperties errors when setting net.dns 
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
 2017-04-13 13:16:22 +09:00
Fyodor Kupolov
9f3cf1a692 Merge "Report app data fixup and prepare timings" into oc-dev 
am: 1423ea3a45

Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
 2017-04-13 04:13:44 +00:00
Bill Yi
c1b9640f9e Import translations. DO NOT MERGE 
Change-Id: I0e9629323dab32e947cb761e4fc89e008c523d5e
Auto-generated-cl: translation import
 2017-04-12 21:13:18 -07:00
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Vladislav Kaznacheev
ee10f27cbe Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc 
am: 2679fe4e95

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
 2017-04-13 03:57:09 +00:00
Vladislav Kaznacheev
2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 
am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc
 2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 2017-04-13 03:36:30 +00:00
Jocelyn Dang
6306035a26 Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev am: 78b3b2308c 
am: ae624f3f0b

Change-Id: Ibae7b4256adfdf9265d68dffbb5189326342471e
 2017-04-13 03:08:46 +00:00
Jocelyn Dang
ae624f3f0b Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 
am: 78b3b2308c

Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
 2017-04-13 02:58:37 +00:00
Jocelyn Dang
78b3b2308c Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 2017-04-13 02:50:52 +00:00
Hugo Benichi
b2f960d1bc Captive portal: fix probe urls at network creation 
This patch changes how url configuration values for captive portal
detection are read: instead of re-reading the settings at every probe
detection, the settings are read once when the NetworkMonitor associated
to a network is created.

If the settings are updated, the new values are picked up by new
networks, but not by existing networks. Since captive portal detection
is most important when joining WiFi networks, the newest available
settings values will still be used.

This change prepares introducing further changes for rotating probe
urls. Especially it helps making the detection strategy stateful with
respect to the lifecycle of a single NetworkMonitor.

Test: built, flashed, tested manually with various portal networks
Bug: 36532213
Merged-In: I71cc8bb8b996462f27f50798d67bceee5ffb898d

(cherry picked from commit b03272c9b5d1b5c71ae591f0e38b1d139d11f19f)

Change-Id: I33ac2b52fea6099969c3fec9b60ba0131f9d672d
 2017-04-13 11:32:50 +09:00
Hugo Benichi
19e3cbdb35 NetworkMonitor: improve captive portal validation logs 
This patch adds probe type and url to all validation logs about web
probes sent for captive portal detection.

Test: built, flashed, looked at $ adb shell dumpsys connectivity
Bug: 36830206, 36532213
Merged-In: Iee2caaf6664f3d097f9d1888ccc5fece0a95994c

(cherry picked from commit d9ac87ed65aa12b93e0b70f5e8560562c850fde0)

Change-Id: I5ab8bb117d2bbad123136dfbbf78cbe84a7f688e
 2017-04-13 11:32:45 +09:00
TreeHugger Robot
63e9903f3d Merge "Address API review for ProxyFileDescriptorCallback" 2017-04-13 02:30:14 +00:00
Sudheer Shanka
911abd9bcf Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev am: 67e802dd5e 
am: 012ddf15c7

Change-Id: Ic491c87920519ac0fc04353f62f02a45dc1ba5fc
 2017-04-13 02:05:17 +00:00
Sudheer Shanka
012ddf15c7 Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev 
am: 67e802dd5e

Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
 2017-04-13 01:59:13 +00:00
Sudheer Shanka
67e802dd5e Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev 2017-04-13 01:53:32 +00:00
Winson Chung
3ab2d3328e Merge "Fix regression when removing task." into oc-dev am: efbcb0d2cc 
am: 67004e209d

Change-Id: I523d86f963a6346edac079abde552e5dff732fb6
 2017-04-13 01:48:53 +00:00
Dianne Hackborn
6cdf56764c Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev am: c62f0d7495 
am: bea817a712

Change-Id: I58010d9417177fed45d01a5c9498aa38cc3c2566
 2017-04-13 01:47:43 +00:00
Winson Chung
67004e209d Merge "Fix regression when removing task." into oc-dev 
am: efbcb0d2cc

Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
 2017-04-13 01:39:01 +00:00
Dianne Hackborn
bea817a712 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev 
am: c62f0d7495

Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
 2017-04-13 01:38:01 +00:00
TreeHugger Robot
efbcb0d2cc Merge "Fix regression when removing task." into oc-dev 2017-04-13 01:29:31 +00:00
TreeHugger Robot
c62f0d7495 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev 2017-04-13 01:27:53 +00:00
Salvador Martinez
fe169d9a0e Merge "Added strings for thermal shutdown warning" into oc-dev am: dc52fd3168 
am: 37393f92f3

Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866
 2017-04-13 01:11:25 +00:00
Sundeep Ghuman
8c79288093 Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker. 
This solves issues where the phone status bar and connected AP in the
picker are out of date.

Bug: 35971425
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/and
roid/settingslib/wifi/WifiTrackerTest.java

Change-Id: I2a7c50de6c754623fd262aac4e9e21d6bd7fc5cf
 2017-04-12 18:10:13 -07:00
Salvador Martinez
37393f92f3 Merge "Added strings for thermal shutdown warning" into oc-dev 
am: dc52fd3168

Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
 2017-04-13 01:01:35 +00:00
Wale Ogunwale
23e60637ea Merge "Dump controller for AppWindowToken" into oc-dev am: b74567dd3b 
am: 651a2970e6

Change-Id: I1b116104494c3c3797c9a6d6277e6ae668f5d232
 2017-04-13 00:58:29 +00:00
Wale Ogunwale
5f9af8362b Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev am: 343cf6e920 
am: c1cb7039b1

Change-Id: I7367e0f6b347c957ce6a6439c31ab657876930c2
 2017-04-13 00:57:31 +00:00
TreeHugger Robot
dc52fd3168 Merge "Added strings for thermal shutdown warning" into oc-dev 2017-04-13 00:51:25 +00:00
Wale Ogunwale
651a2970e6 Merge "Dump controller for AppWindowToken" into oc-dev 
am: b74567dd3b

Change-Id: I1c166eb1c7ad36396d7a463549d0ab1f9daebb61
 2017-04-13 00:49:12 +00:00
Wale Ogunwale
c1cb7039b1 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev 
am: 343cf6e920

Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d
 2017-04-13 00:48:06 +00:00
TreeHugger Robot
b74567dd3b Merge "Dump controller for AppWindowToken" into oc-dev 2017-04-13 00:43:42 +00:00
Wale Ogunwale
343cf6e920 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev 2017-04-13 00:39:16 +00:00
Wale Ogunwale
919a05d4a3 Revert "Ensure visible activities when device is unlocked." 
Causes issues with window life-cycle...

Bug: 37119770
Bug: 37244415
Bug: 37281544
This reverts commit 7004a8801d0a60013681a86043bab74b4d42d680.

Change-Id: I0039db6e44488cd82ef745aa979bc8549fd8aeed
 2017-04-13 00:36:34 +00:00