Commit Graph

9439 Commits

Author SHA1 Message Date
Julia Reynolds
fbf851b473 Merge changes Iaf63b4e8,Ie76044d4 into pi-dev am: a60e6f81df
am: e8a6b12f01

Change-Id: I7d48d3e13887897904d7a4a537c8624be10272f2
2018-03-14 22:02:10 +00:00
Julia Reynolds
0b8455d4d8 Change DND upgrade noti text and channel
Test: manual
Bug: 74075050
Change-Id: Iaf63b4e8691ba42ac4d1ddccf8f2368bfc0b74d7
2018-03-14 11:40:12 -04:00
Annie Meng
d3b6e9fe22 Merge "DO NOT MERGE Create a key value settings observer for backup parameters" into pi-dev 2018-03-14 13:40:46 +00:00
Annie Meng
21c1f35c1a Merge "Create a key value settings observer for backup parameters" 2018-03-14 10:38:36 +00:00
TreeHugger Robot
2801bf00de Merge "Display shortcut modifiers in menu" into pi-dev 2018-03-14 02:48:57 +00:00
Annie Meng
7d3033b11f DO NOT MERGE Create a key value settings observer for backup parameters
Extracts an abstract class to observe changes in backup parameter settings that
are stored as a comma-separated key value list. This class is
responsible for registering and unregistering a content observer on the
setting and updating local references to the parameters.

Refactor BackupManagerConstants and LocalTransportParameters to use this
implementation. This will also be used for the new backup timeout
setting.

Bug: 74346317
Test: 1) m -j RunFrameworksServicesRoboTests ROBOTEST_FILTER=BackupManagerConstantsTest
2) gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases -t com.google.android.gts.backup.TransportFlagsHostSideTest

Change-Id: Id4c50fbcf7479c925515887e3fa70e166dd9955c
2018-03-13 18:47:46 +00:00
Annie Meng
48b2ecae52 Create a key value settings observer for backup parameters
Extracts an abstract class to observe changes in backup parameter settings that
are stored as a comma-separated key value list. This class is
responsible for registering and unregistering a content observer on the
setting and updating local references to the parameters.

Refactor BackupManagerConstants and LocalTransportParameters to use this
implementation. This will also be used for the new backup timeout
setting.

Bug: 74346317
Test: 1) m -j RunFrameworksServicesRoboTests ROBOTEST_FILTER=BackupManagerConstantsTest
2) gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases -t com.google.android.gts.backup.TransportFlagsHostSideTest

Change-Id: Id4c50fbcf7479c925515887e3fa70e166dd9955c
(cherry picked from commit 16ef6ffb3cbea77637ad99c2b0c79cbfd8f03c9a)
2018-03-13 18:24:12 +00:00
TreeHugger Robot
1774a14d88 Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" 2018-03-13 17:19:35 +00:00
dalyk
21d15049f4 Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug: 71828272
Merged-In: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Merged-In: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
(cherry picked from commit 99c5029b91)
2018-03-13 22:39:59 +09:00
Erik Kline
15b77dafd9 Merge "Add new netd event callback for changes to private DNS validation state." am: 40ca5a06bf am: 5e9725bdc7
am: be5e9b4257

Change-Id: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
2018-03-13 13:35:49 +00:00
Erik Kline
be5e9b4257 Merge "Add new netd event callback for changes to private DNS validation state." am: 40ca5a06bf
am: 5e9725bdc7

Change-Id: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
2018-03-13 13:23:08 +00:00
Erik Kline
5e9725bdc7 Merge "Add new netd event callback for changes to private DNS validation state."
am: 40ca5a06bf

Change-Id: I504148b6a508b6f5e4b5dfa0976362496b91c15c
2018-03-13 13:11:37 +00:00
Jiyong Park
7ceb0bd7b6 Merge "Limit the systemconfig tags allowed to vendors" into pi-dev am: 75029d0dbc
am: d174695734

Change-Id: I5ceb5478d10efb28a4ebf143d33be94c7cf06ba9
2018-03-13 06:50:11 +00:00
TreeHugger Robot
75029d0dbc Merge "Limit the systemconfig tags allowed to vendors" into pi-dev 2018-03-13 04:08:33 +00:00
Vladislav Kaznacheev
d842533f22 Display shortcut modifiers in menu
Prepend relevant meta key names (such as Ctrl+) to the shortcut
displayed in a menu.

Do not prepend "Menu+" if the device does not have a hardware Menu key.

Bug: 31045453
Test: run ApiDemos (MenuInflateFromXml), select "Shortcuts", observe
  Ctrl+ prepended to shortcuts.

Change-Id: I1a38bd1baf069dd1adb24a26f89c6db6390b8b8d
(cherry picked from commit 0cc2c6b190)
2018-03-12 17:53:57 -07:00
Rubin Xu
5bc5678e9c Merge "Move escrow APIs into LockSettingsInternal" into pi-dev am: e40dcabbc8
am: 3f85ad8abd

Change-Id: I03aec40928d4c22ea8b668d70b61cc0b75507b87
2018-03-12 21:13:10 +00:00
Vadim Tryshev
67a9abf4ad Merge "Adding generation of ACTION_TOGGLE_RECENTS to shared lib" into pi-dev am: 82bc5baeb5
am: 2eedba70d4

Change-Id: I8282727838e637421d35eaf4a023c721436bee85
2018-03-12 20:01:58 +00:00
dalyk
99c5029b91 Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug: 71828272
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
2018-03-12 15:00:55 -04:00
TreeHugger Robot
e40dcabbc8 Merge "Move escrow APIs into LockSettingsInternal" into pi-dev 2018-03-12 18:51:28 +00:00
TreeHugger Robot
82bc5baeb5 Merge "Adding generation of ACTION_TOGGLE_RECENTS to shared lib" into pi-dev 2018-03-12 18:13:16 +00:00
Rubin Xu
fcd49f993e Move escrow APIs into LockSettingsInternal
Remove the IPC interfaces so these APIs are only available to other
services running inside system server process only.

Bug: 62264551
Test: runtest frameworks-services -p com.android.server.locksettings
Change-Id: Ic7ac5df5fb977bc68a2c4daafaa3cdaf3ba66fcd
2018-03-12 11:57:34 +00:00
Mihai Popa
fb4b6b8fd2 [Magnifier-28] Set corner radius
This CL updates both the magnifier and the floating toolbar to use the
dialogCornerRadius attribute for the corner radius of their windows. In
both we use its value defined in the default device theme, rather than
the value defined in the application's custom theme.

Bug: 70848492
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ifcf4cff1f38fd18b7dbb4c1802390e3beb92cd3c
(cherry picked from commit 3dcbc2112d)
Merged-In: Ifcf4cff1f38fd18b7dbb4c1802390e3beb92cd3c
2018-03-12 11:49:23 +00:00
Mihai Popa
05934a4e7e Merge "[Magnifier-28] Set corner radius" 2018-03-12 11:47:08 +00:00
Jiyong Park
50eae0f452 Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev am: f85de9616f
am: 2530078d58

Change-Id: Ib7184fcee32a16036c39ececf2ab736064ecdbec
2018-03-12 05:35:52 +00:00
TreeHugger Robot
f85de9616f Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev 2018-03-12 05:07:32 +00:00
Jiyong Park
fad9944e7e Limit the systemconfig tags allowed to vendors
Vendors are allowed to customize these systemconfig tags only.

<library>
<feature>
<privapp-permissions>

This is because the systemconfig tags are essentially the part of system
<-> vendor interface and thus need to be stable (or evolve in a backward
compatible manner) across several Android releases and we would like to
keep the interface as small as as possible.

However, since vendors were allowed to use more tags (like <permission>,
<app-link>, <default-enabled-vr-app>) in Oreo and Oreo-MR1, this
limitation is applied only for newly launching devices whose first API
level is equal to or greater than P.

Bug: 70821981
Test: wahoo is bootable (launched with Oreo)
Test: crosshatch is bootable (launched with P)
Test: adb logcat -s SystemConfig does not show that a tag is not
supported

Change-Id: I371b93a80f3d9728ea6d35022081776a8658d9f3
2018-03-12 12:05:50 +09:00
Yohei Yukawa
e5826fd198 Merge changes from topic "yukawa-b66498367" into pi-dev am: c8b967a5de
am: 285bccf873

Change-Id: Ie22cf7f3c0646f37951bdcd96584b144b43ff4ef
2018-03-12 02:39:40 +00:00
TreeHugger Robot
c8b967a5de Merge changes from topic "yukawa-b66498367" into pi-dev
* changes:
  Revert "Switch and store keyboard layouts based on IME subtype."
  Revert "Accept null subtype in InputMethodSubtypeHandle."
2018-03-12 01:58:06 +00:00
Jiyong Park
090c6b1c94 Allow apps in /odm/app and /odm/priv-app
/odm is a vendor partition other than /vendor. Both partitions are for
HW-specific modules such as HALs. The difference is that /odm is owned
by ODM (usually device manufacturer which designs the board), whereas
/vendor is owned by SoC manufacturer. In other words, /odm partition is
for board-specific customization to the /vendor partition.

Since apps can exist in /vendor/app and /vendor/priv-app, the same has
to be supported for /odm partition.

Bug: 71366495
Test: m -j
Teet: cd frameworks/base/tests/OdmApps; atest .
Change-Id: I1ec8b22b080efdefd67a45ce9c7aeaa2aef350e0
2018-03-12 10:40:33 +09:00
Vadim Tryshev
2f4d2af93a Adding generation of ACTION_TOGGLE_RECENTS to shared lib
Bug: 72967764
Test: atest google/perf/app-transition/sysui-latency-test, watch for 1_*
entries in output

Change-Id: I0bfaa46df4f3167687099742cb3063e88dab30ae
2018-03-09 19:15:56 -08:00
Julia Reynolds
dab3a5abec Merge "Merge "Update alarm and messaging dnd filtering" into pi-dev am: 0f6bcc9c4d" into pi-dev-plus-aosp
am: cba4073259

Change-Id: Icba988d86902a685674d275a5742e7c56403f750
2018-03-10 03:07:00 +00:00
Vladislav Kaznacheev
5c78c2a10a Merge "Display shortcut inline with item title in cascading menu" into pi-dev am: ae957a780e
am: a26f82e9af

Change-Id: I3b6b532736a12b10ec0646608832216266c8c378
2018-03-09 15:03:02 +00:00
Mihai Popa
3dcbc2112d [Magnifier-28] Set corner radius
This CL updates both the magnifier and the floating toolbar to use the
dialogCornerRadius attribute for the corner radius of their windows. In
both we use its value defined in the default device theme, rather than
the value defined in the application's custom theme.

Bug: 70848492
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ifcf4cff1f38fd18b7dbb4c1802390e3beb92cd3c
2018-03-09 14:30:32 +00:00
Vladislav Kaznacheev
a26f82e9af Merge "Display shortcut inline with item title in cascading menu" into pi-dev
am: ae957a780e

Change-Id: I484cb6f01191ac5ce044fd94f7e32970aec2dfb1
2018-03-09 14:29:00 +00:00
Julia Reynolds
51eb78f8f8 Update alarm and messaging dnd filtering
- Check audio attributes on the notificationrecord, not the
notification (to take into account the notification channel audio)
- Allow notifications that use messaging style to be considered a
message for dnd

Test: runtest systemui-notification
Change-Id: I8e6a86ed62089a53fe71000e6d9da00f1c54b59e
Fixes: 74243745
Fixes: 74311423
2018-03-09 13:56:43 +00:00
dalyk
28011a4180 Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback.
Test: None
Bug: 71828272
Merged-In: I261015d0d3e7e4159bb514742a6c588bfd34e795
Merged-In: I3a701fc52641615bf197f980022a61518c7347f4
Merged-In: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Merged-In: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
Change-Id: I75e0620f82195f18befe9dc079492a8c69bb764b
(cherry picked from commit 985d89a6e0)
2018-03-09 19:41:56 +09:00
Erik Kline
0aeae36fc5 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am: 59787b4247 am: 30563dee52
am: 4ea65c2f00

Change-Id: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
2018-03-09 10:14:21 +00:00
Erik Kline
4ea65c2f00 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am: 59787b4247
am: 30563dee52

Change-Id: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
2018-03-09 07:24:30 +00:00
Erik Kline
30563dee52 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback."
am: 59787b4247

Change-Id: I63d8b36ec1594134bce8c60eb653e9b53a1b1963
2018-03-09 07:01:21 +00:00
Erik Kline
59787b4247 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." 2018-03-09 04:49:51 +00:00
Vladislav Kaznacheev
bf7cc38d1f Display shortcut inline with item title in cascading menu
Bug: 74208750
Test: run android.widget.cts.PopupMenuTest on a large screen device
  such as hikey960.

Change-Id: I1c4bca3cfecb012432e6cb89cb4cc0177ccc04f9
2018-03-08 23:08:41 +00:00
Mike Ma
726f11d2ec Merge "Remove PowerProfile.POWER_NONE" into pi-dev am: 25ebcdb28c
am: b2c0449796

Change-Id: I77dde61610b17d6c264833f6ef7deca63ad33211
2018-03-08 21:45:15 +00:00
dalyk
985d89a6e0 Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback.
Test: None
Bug: 71828272
Change-Id: I75e0620f82195f18befe9dc079492a8c69bb764b
2018-03-08 16:35:57 -05:00
TreeHugger Robot
25ebcdb28c Merge "Remove PowerProfile.POWER_NONE" into pi-dev 2018-03-08 20:14:30 +00:00
Mike Ma
8db14d7d9a Remove PowerProfile.POWER_NONE
Change-Id: I49b3f3989a675bcb1ef83f5b86a55f3f5a0d3b2f
Fixes: 74389802
Test: com.android.internal.os.PowerProfileTest
2018-03-08 10:14:46 -08:00
Yohei Yukawa
2d9accb29f Revert "Switch and store keyboard layouts based on IME subtype."
This reverts commit d5f7ed9fe9 [1].

Reason for revert:
This is the part 2 of a series of reverts to unlaunch Bug 25752812,
which aimed to improve UX but did not work well.

See I7a2ed6dd39dcd8207d3d94e12cd01d5d67ba4bb5 for the detailed reason
of revert.

 [1]: Ie88ce1ab77dbfe03ab51d89c1dc9e0a7ddbb3216

Bug: 66498367
Test: Manually done
Change-Id: I207919e3cb081d77712371f58463a5d423717c8f
2018-03-07 19:15:15 -08:00
Yohei Yukawa
36abd8a6d6 Revert "Accept null subtype in InputMethodSubtypeHandle."
This reverts commit 46ac35d09b [1].

Reason for revert:
This is the part 1 of a series of reverts to unlaunch Bug 25752812,
which aimed to improve UX but did not work well.

See I7a2ed6dd39dcd8207d3d94e12cd01d5d67ba4bb5 for the detailed reason
of revert.

 [1]: Ia013784a594ad3beaf30976d047f5ac0fa8185be

Bug: 66498367
Test: Manually done
Change-Id: Ifd17b53704b3dff75b6ef3be6835f51271859933
2018-03-07 19:14:47 -08:00
Chenjie Yu
c8a6305ddf Merge "Refactor cpu stats pullers" into pi-dev 2018-03-08 00:24:00 +00:00
Kevin Chyn
3c3f48880e Merge "Don't store lockout deadline in lockSettings" into pi-dev am: 7f8967e3ce
am: f71e2f4ec9

Change-Id: Ie3728420dd97bb99a835a577a64bb48f8e0cde49
2018-03-08 00:15:37 +00:00
Chenjie Yu
ec67661bdf Refactor cpu stats pullers
use same cpu stats readers with BatteryStats so that
1) both throttle to avoid too frequent pulls
2) cached value is served within throttle interval to avoid double
pulling by both statsd and BatteryStats

To run unit tests:
bit
FrameworksCoreTests:com.android.internal.os.KernelUidCpuFreqTimeReaderTest
bit
FrameworksCoreTests:com.android.internal.os.KernelUidCpuClusterTimeReaderTest
bit
FrameworksCoreTests:com.android.internal.os.KernelUidCpuActiveTimeReaderTest

make -j56 statsd_test && adb sync data && adb shell
/data/nativetest64/statsd_test/statsd_test

Test: cts test, unit test
Bug: 73745189
Bug: 73780619
Bug: 73360959

Merged-In: I10a9bc91ca67fa812f4cd71c4fbd73c1a5ba580e

Change-Id: I10a9bc91ca67fa812f4cd71c4fbd73c1a5ba580e
2018-03-07 21:43:00 +00:00