Commit Graph

8530 Commits

Author SHA1 Message Date
Vladislav Kaznacheev
644b2d1f1e Merge "Fix tooltips for views in a popup window" into oc-mr1-dev am: 6a1dad9194
am: 8e8b215272

Change-Id: I34b9b957b47da302d521b64e80d9e16f094e2b34
2017-08-29 19:33:07 +00:00
Vladislav Kaznacheev
8e8b215272 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am: 6a1dad9194

Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba
2017-08-29 19:21:09 +00:00
TreeHugger Robot
6a1dad9194 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev 2017-08-29 19:08:30 +00:00
Sudheer Shanka
4158f4b8fb Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev am: 903dc2fdd2
am: 4411d84551

Change-Id: I4a1a8b21333f7a395a4a3aa571e1aca19b89fd09
2017-08-29 18:20:33 +00:00
Sudheer Shanka
4411d84551 Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
am: 903dc2fdd2

Change-Id: I2810e61300d5c2317639b261898931e66d075cb5
2017-08-29 18:01:14 +00:00
Sudheer Shanka
6b1396e8fe KernelUidCpuFreqTimeReader: Put logs under debug flag.
Bug: 63041570
Test: N/A
Change-Id: Ifdeacb227bb936de82af9c9505621b327de3a9d2
2017-08-28 23:06:38 -07:00
Fyodor Kupolov
2ba18273ab Merge "Added tron metrics for shutdown time" into oc-mr1-dev am: 30c565d399
am: 8908b418ee

Change-Id: I6eb5c2270b636880ccdd840703bff6925a2b39d3
2017-08-28 19:09:42 +00:00
Fyodor Kupolov
8908b418ee Merge "Added tron metrics for shutdown time" into oc-mr1-dev
am: 30c565d399

Change-Id: I10d4479c79c1997325f74477a94e4f74eb043f46
2017-08-28 18:50:48 +00:00
Fyodor Kupolov
30c565d399 Merge "Added tron metrics for shutdown time" into oc-mr1-dev 2017-08-28 18:41:52 +00:00
Fyodor Kupolov
291f63bb54 Added tron metrics for shutdown time
The metrics are persisted in /data/system/shutdown-metrics.txt file
property and logged after reboot. MetricsLogger API cannot be directly
used during shutdown since event log is cleared on reboot/power off.

Test: manual reboot/shutdown and verify that metrics are logged
Bug: 64815357
Change-Id: I7fa1af8be58a80a3d5bae26d55c1ed40bf98f4c0
2017-08-25 16:59:08 -07:00
TreeHugger Robot
2e41218797 Merge "Adding group divider support in Android Menus" 2017-08-25 23:33:17 +00:00
Tarun Lohani
0b842b465e Adding group divider support in Android Menus
Added a divider view in popup_menu_item_layout.
Hiding divider where they are not required in MenuAdapter.

Bug: 32172964
Test: Added test method testGroupDividerEnabledAPI to PopupMenuTest.java
Change-Id: I9cf0e9a72f085336e9f136a7ed17aead0e30760c
2017-08-25 20:18:11 +00:00
Selim Cinek
7b5e9c2cff Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev am: 02f8fa9603
am: f3dbfd5e88

Change-Id: I0a05c16dda34fdb75c6f5d0a5c27e59b0ba01783
2017-08-25 19:52:12 +00:00
Selim Cinek
f3dbfd5e88 Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev
am: 02f8fa9603

Change-Id: Ic46388c35651217b7f39b12aec8ba1a34f537d36
2017-08-25 19:33:07 +00:00
TreeHugger Robot
02f8fa9603 Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev 2017-08-25 19:13:44 +00:00
Selim Cinek
3a49ba2e40 Fixed that the status icons were showing in the camera
When launching to quicksettings, the camera icons showed
above the camera, clashing with their UI

Test: launch camera (locked) and click on galery
Fixes: 64317909
Change-Id: I4ef68963af11f6d0be739c79cdf352ba35d9ece0
2017-08-25 09:44:14 -07:00
Roozbeh Pournader
2be7eff3a4 Merge "Use fallback-based line spacing in TextView etc" 2017-08-24 19:24:06 +00:00
Wale Ogunwale
3382ab1fc7 Migrated some windowing methods from StackId to WindowConfiguration
First pass at transitioning away from using stack ids for windowing mode
to WindowConfiguration. Added some TODO that will require the introduction
of applicationType in WindowConfiguration before additional conversation
can be done.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I2b315623faa16445a9f942e082089123842cb5a1
2017-08-24 08:57:10 -07:00
Roozbeh Pournader
5caf5a690f Use fallback-based line spacing in TextView etc
In TextView and Switch, version-gate the use of
setUseLineSpacingFromFallbacks() to apps targeting Android P and
later for backward compatibility.

In internal widgets, ImageFloatingTextView and SubtitleView, always
turn it on, since there is no backward compatibility concerns.

Bug: 28963299
Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.SwitchTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Change-Id: Icfe4e71ba26bbc6755ba12ddab72e6bf20b3ce25
2017-08-23 17:41:06 -07:00
Sudheer Shanka
523c42e85c Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am: 29091ec55f" into oc-mr1-dev-plus-aosp
am: 383551da86

Change-Id: I9303dbda0f4d82c161d8cddacc8d3a56ebe1d52c
2017-08-23 23:01:49 +00:00
Sudheer Shanka
24fbd020fb Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
am: 29091ec55f

Change-Id: I2540bd98007d8471758dfcbf365cab231594c52c
2017-08-23 22:38:49 +00:00
Sudheer Shanka
29091ec55f Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev 2017-08-23 22:26:08 +00:00
Sudheer Shanka
8cde930d71 Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e
Bug: 63041570
Test: N/A
Change-Id: I2cb12f1b8f0333c4a000d601624dc95934cf9b90
2017-08-23 11:29:23 -07:00
Selim Cinek
b481c010e6 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev am: 60a09546c0
am: 0c8a132ea3

Change-Id: Ie7e15d7c4010c0e3cbf0081a1a4084767c83b1fa
2017-08-23 16:23:40 +00:00
Selim Cinek
0c8a132ea3 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
2017-08-23 16:07:49 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Vladislav Kaznacheev
df6ee1ecbe Fix tooltips for views in a popup window
The current implementation is using the anchor view's getWindowToken to
construct the TooltipPopup instance. This does not work if the anchor
view is in a popup window.

Using getApplicationWindowToken fixes the problem.

Bug: 64595364
Test: android.view.cts.TooltipTest#testTooltipInPopup
Change-Id: I1a887c9ae6ac00f2412891f316367acfc56cef94
2017-08-22 15:34:22 -07:00
Julia Reynolds
433d3ab9f8 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0 am: 4796cf6b43
am: 30e9c9c973

Change-Id: I02a3ace673e19f738450112a9c06b1483fa648a4
2017-08-17 23:31:57 +00:00
Julia Reynolds
30e9c9c973 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f
2017-08-17 23:20:57 +00:00
Julia Reynolds
4796cf6b43 Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6
2017-08-17 23:13:29 +00:00
Julia Reynolds
c23a2e67ac Let the foreground service channel be blocked
And update the channel name

Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes: 36891897
Test: manual
2017-08-17 14:11:45 -04:00
Lucas Dupin
1d0eda938a Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee
2017-08-17 03:24:34 +00:00
Luis Hector Chavez
07f403a0ea Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c
am: 22f95dbdc0

Change-Id: I673549399e3cae4501cac77c510dbc30a5ed8163
2017-08-17 02:59:38 +00:00
Lucas Dupin
bc3a3df807 Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
am: 69bb2bae90

Change-Id: I04da1b0857fcdecf8f662936f41ddb7bc026dd21
2017-08-17 01:03:22 +00:00
Lucas Dupin
fda1152e59 Merge "API Council feedback" into oc-mr1-dev
am: 07c83d00c9

Change-Id: I115e1145b47d97b29a988133d9ec94ebe6e39637
2017-08-16 23:38:38 +00:00
Luis Hector Chavez
22f95dbdc0 Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4
am: 64f1d42e6c

Change-Id: I785676decb2fc7ddfa9034fbafdfc2deb2f07604
2017-08-16 23:11:35 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
Luis Hector Chavez
64f1d42e6c Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55
am: 755baf92b4

Change-Id: I07eb375c2b86651fd7d65f944b19161d2c977df4
2017-08-16 22:11:14 +00:00
Todd Kennedy
519b589300 resolve merge conflicts of d22603ebd2 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Luis Hector Chavez
755baf92b4 Merge "Improve container capability bounding in containers" am: 586fd52b34
am: ed05287c55

Change-Id: I6068105d31418ec7b1c89f099bf635618147c227
2017-08-16 21:43:28 +00:00
Luis Hector Chavez
ed05287c55 Merge "Improve container capability bounding in containers"
am: 586fd52b34

Change-Id: I7c67b571164e67b3e4a8ae9c9a2701e338693a4b
2017-08-16 21:32:13 +00:00
Treehugger Robot
586fd52b34 Merge "Improve container capability bounding in containers" 2017-08-16 21:16:50 +00:00
Lucas Dupin
69bb2bae90 Merge "Do not filter out some colors" into oc-mr1-dev
am: a9774680f8

Change-Id: I3208d426529d434a8ef3a1145e16fc6db566a874
2017-08-16 19:52:34 +00:00
TreeHugger Robot
a9774680f8 Merge "Do not filter out some colors" into oc-mr1-dev 2017-08-16 19:38:45 +00:00
Hugo Benichi
aef8a96dcd Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8 am: 1ada5660ce
am: d79f39689e

Change-Id: I147be11313f6d327116feb1b6807b1bd6aaba4f8
2017-08-16 18:43:48 +00:00
Todd Kennedy
cab962b8d0 Merge "Allow explicit permission denial" into oc-mr1-dev
am: 7fc53a11f8

Change-Id: I4772c35c57a9b8789417d5e04292c206a001d7e4
2017-08-16 17:41:38 +00:00
TreeHugger Robot
7fc53a11f8 Merge "Allow explicit permission denial" into oc-mr1-dev 2017-08-16 17:11:30 +00:00
Luis Hector Chavez
72042c99a6 Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.

When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.

Bug: 63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
      system_server does not request it.

Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
2017-08-16 08:21:58 -07:00
Todd Kennedy
74629e3183 Allow explicit permission denial
Change-Id: I5d348ed555f249d210253dab60ae11d4831c4f0a
Fixes: 63675512
Test: Manual
2017-08-16 14:43:05 +00:00
Hugo Benichi
d79f39689e Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8
am: 1ada5660ce

Change-Id: I5e1376137cf20127839ac043b02f256c89e7c2cc
2017-08-16 12:32:51 +00:00