314688 Commits

Author SHA1 Message Date
Adam Lesinski
cb276fa531 Merge "AAPT2: Generate R.txt" into oc-dev
am: d1a6e6740f

Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
2017-04-13 06:59:33 +00:00
Michael Wright
49f1db32ef Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
am: 07d60cce02

Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
2017-04-13 06:55:21 +00:00
TreeHugger Robot
d1a6e6740f Merge "AAPT2: Generate R.txt" into oc-dev 2017-04-13 06:54:21 +00:00
Adam Lesinski
3395e15204 Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
am: 4ad2ebcc90

Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
2017-04-13 06:54:21 +00:00
Bill Yi
f54f0ea174 Import translations. DO NOT MERGE
Change-Id: I3bf092ebb3c99f4708f20d2d303e201c1da1ae9a
Auto-generated-cl: translation import
2017-04-12 23:53:10 -07:00
TreeHugger Robot
07d60cce02 Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev 2017-04-13 06:48:29 +00:00
TreeHugger Robot
4ad2ebcc90 Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev 2017-04-13 06:42:52 +00:00
Chong Zhang
847beba350 Merge changes from topic 'api-review' into oc-dev
am: fd89a95f35

Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
2017-04-13 06:34:25 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
2017-04-13 06:32:28 +00:00
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
2017-04-13 06:23:51 +00:00
Erik Kline
23c0170352 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca
am: 1d3528ba86

Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
2017-04-13 06:18:38 +00:00
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
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
Svet Ganov
c3d1c85bda Allow custom buttons in autofill UI
Test: added CTS test in topic

bug:36871561

Change-Id: I78ffd8ba33fb982183677fffc587bbf1a077e132
2017-04-12 22:34:32 -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
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
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
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Dongwon Kang
2e7f5ce709 TIF: add helper methods for making a channel browsable.
Test: build and manually tested with a local app.
Bug: 36395259, Bug: 36097352
Change-Id: I512ed6f4da21af01445fdbcd2f200a681c5dde19
2017-04-12 20:55:22 -07: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
Daichi Hirono
e200ae8157 Address API review for ProxyFileDescriptorCallback
The CL revise the documentation for ProxyFileDescriptorCallback.

 * Added explanation to onFsync.
 * Added explanation about offset.
 * Mentioned ErrnoException should contain E constants in OsConstants.

Bug: 35813046
Test: Build succeed
Change-Id: Ied2490b1913445ea8240eb3aaf7c12170ae4e42d
(cherry picked from commit 9555e30288fe984dcb788c496e7582c14faa66da)
2017-04-13 03:40:08 +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
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
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
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
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
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