Commit Graph

2892 Commits

Author SHA1 Message Date
Sudheer Shanka
8e1c376d69 Merge "Fix and enable ConnOnActivityStartTest." 2017-08-17 02:10:44 +00:00
Sudheer Shanka
ded7ab0fff Fix and enable ConnOnActivityStartTest.
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
  initialization.

Bug: 38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
      test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
2017-08-16 14:41:11 -07:00
Julia Reynolds
06640566a7 Merge "Merge "Optionally append managed service approvals" into oc-mr1-dev am: d87e79aae6" into oc-mr1-dev-plus-aosp
am: 94bd234479

Change-Id: I5d8a7dafb0b3938324df494ee49c644a47ef6d96
2017-08-15 21:59:50 +00:00
TreeHugger Robot
d87e79aae6 Merge "Optionally append managed service approvals" into oc-mr1-dev 2017-08-15 21:22:21 +00:00
Lucas Dupin
bd4662cd31 Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am: 3d141421f8
am: 6f8363aea2

Change-Id: I7b6e15910762f9f7ef2b3576778e3f00fc7dd5cd
2017-08-15 20:50:54 +00:00
TreeHugger Robot
3d141421f8 Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev 2017-08-15 20:24:27 +00:00
Julia Reynolds
fa206a4d12 Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced
in O).

Test: runtest systemui-notification
Change-Id: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Fixes: 64232609
2017-08-15 14:57:09 -04:00
David Stevens
1583a4f9c8 Merge "Let external activities run when the primary display is off" 2017-08-15 18:07:15 +00:00
TreeHugger Robot
23494e3fe2 Merge "Update WindowManager to output dumpsys in protobuf format" 2017-08-15 17:52:10 +00:00
Lucas Dupin
416fe954e9 Improved WallpaperService.Engine tests
Using final variables when possible, also testing if
overlaping invalidation requests will be posted to
the handler.

Bug: 63585249
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Change-Id: I01cdbdfd5313e55d7a58c77f705aea0f6f817518
2017-08-15 10:19:48 -07:00
David Stevens
9440dc87a6 Let external activities run when the primary display is off
- Make activity sleep state independent of power manager wakefulness
  state. The state is now entirely dependent on sleep tokens (and the
  voice interactor).
- Make sleep tokens operate on a per-display basis (and convert the
  keyguard to a sleep token).
- Make ActivityStackSupervisor acquire/release sleep tokens for
  non-default displays when the displays are turned on/off.
- Make WindowManagerService.okToDisplay operate on a per-display basis.

Bug: 34280365
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testExternalDisplayToggleState
Change-Id: I92086d7006a67b4b4f320c9bb3aa606954f85012
2017-08-14 21:59:06 -07:00
Steven Timotius
af03df6a7a Update WindowManager to output dumpsys in protobuf format
Implement enough functionality in protobuf dumpsys to replicate
old functionaltiy in android.server.cts.WindowManagerState

Test: cts-tradefed run commandAndExit cts-dev --module CtsWindowManagerHostTestCases
cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases
Change-Id: Ib527ab3f44620a08cf03b77c37c2bae883d90e13
2017-08-14 17:06:17 -07:00
Wale Ogunwale
7ff3ff33df Merge "Switch WindowContainer to use ConfigurationContainer" 2017-08-14 18:24:45 +00:00
Jeremy Joslin
ea58747371 Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev am: 66042e0caf
am: e5cdc925dd

Change-Id: I673af2506d51945dc02f484efe98facfbe99b943
2017-08-14 17:11:10 +00:00
TreeHugger Robot
66042e0caf Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev 2017-08-14 16:50:50 +00:00
Beverly
ceb18985bc Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev am: 2593d707f7
am: 6e23bfc386

Change-Id: Ie046074ea546764115677c5ca3e0163c2e90641b
2017-08-11 17:14:00 +00:00
TreeHugger Robot
2593d707f7 Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev 2017-08-11 16:56:10 +00:00
Julia Reynolds
e1d13d988a Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev am: b4472f4bde
am: 07497c39d5

Change-Id: I71ccf034a1789c333c46f914ffa4b6bbcdd0f9a0
2017-08-11 16:51:52 +00:00
TreeHugger Robot
b4472f4bde Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev 2017-08-11 16:22:59 +00:00
Sudheer Shanka
8518991995 Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am: 06668b5f73
am: d732136ed1

Change-Id: Iff9111b3d1e3af576de8327e7fe0fdddf7bcadb1
2017-08-11 03:22:38 +00:00
Sudheer Shanka
6ebc3c8da1 Merge "Update NPMS.setRestrictBackgroundUL to notify listeners." 2017-08-11 01:40:44 +00:00
Sudheer Shanka
06668b5f73 Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev 2017-08-10 22:52:40 +00:00
Beverly
5d463b6c88 Pleasant sound implemented for in-call notif.
Replacing tone generator with an audio file for in-call notifications from text messages.

Fixes: 38194285
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java
Change-Id: I9ec28ff54ae259ae906b3db08ece7059707c7edb
2017-08-10 21:27:20 +00:00
Julia Reynolds
a13b3e2574 Group new free notis if autogroup summary exists
In the case where an app posted enough notifications to
get an autogrpup summary, but then canceled most of them,
add all new group-less notifications to the autogroup summary
even if the total number of notifications currently posted
by the app is < the autogroup trigger number

Test: runtest systemui-notification, cts
Change-Id: I6f7a8a0140abcff2b0f78eacfbf23cfab12897fa
Fixes: 64158706
2017-08-10 17:15:31 -04:00
Beverly
f9e1db857a Merge "Localization of zen mode default rules." into oc-mr1-dev am: 15ea142044
am: 516be39336

Change-Id: I26fd676a9cb96d0de3f9be715a4fb4591ef031c8
2017-08-10 17:00:46 +00:00
TreeHugger Robot
15ea142044 Merge "Localization of zen mode default rules." into oc-mr1-dev 2017-08-10 16:41:36 +00:00
Christine Franks
aa6f51811e Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 8121e6c162
am: c2fabb2f8e

Change-Id: Ie286d80440bfdb0de87e4f34a45acfdc99998bda
2017-08-10 05:53:11 +00:00
Christine Franks
8121e6c162 Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0

Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651
2017-08-10 05:37:57 +00:00
TreeHugger Robot
88710dead0 Merge "Add settings and reset operations for demo users" into oc-dr1-dev 2017-08-10 05:28:47 +00:00
Christine Franks
9a18f5fa40 Add settings and reset operations for demo users
- Allow Global settings to be set in demo mode
- Allow Secure settings to be set by demo users
- Allow fully enabling apps for demo users
- Send enable broadcast as foreground broadcast

Bug: 62712426
Test: runtest -c \
com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services

Change-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5
2017-08-09 19:18:20 -07:00
Makoto Onuki
2eee04d2c2 Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev am: 75590ffa84
am: bb4f580494

Change-Id: I204695ecd43fe86eb6837098556aa1e7c0db354f
2017-08-10 01:33:09 +00:00
Andrii Kulian
3a0664972e Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d am: e2df0c7f8d" into oc-mr1-dev-plus-aosp
am: 33ed27aa00

Change-Id: I7420109571695b4ccdbf6c1a473a57dd5ff445ad
2017-08-10 00:36:30 +00:00
TreeHugger Robot
75590ffa84 Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev 2017-08-10 00:18:56 +00:00
TreeHugger Robot
ee077274a2 Merge "Annotating Test to add it to continuous testing" 2017-08-10 00:12:33 +00:00
Andrii Kulian
e2df0c7f8d Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
am: 7afbe54e0d

Change-Id: I9e3d26c49742cde534ade6a8568e0d021d6e2321
2017-08-09 22:53:49 +00:00
Suprabh Shukla
6a565d0021 Annotating Test to add it to continuous testing
Test: forrest --extra_args='--class \
com.android.server.AppOpsUpgradeTest' test FrameworksServicesTests

Change-Id: I631d836ab3de5d808a2f337b44329d3250a492e0
2017-08-09 14:55:37 -07:00
Lucas Dupin
f29554615a Merge "Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev am: 9d836b6312" into oc-mr1-dev-plus-aosp
am: 0fd9139d71

Change-Id: I52a8c88bd3abbb7424b9c63b8330d6ac6c2356aa
2017-08-09 21:01:28 +00:00
Beverly
d4f964922c Localization of zen mode default rules.
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: If7c38e5da56dd171e296182ef2c36e7286666ec5
Fixes: 38128497
2017-08-09 16:47:44 -04:00
TreeHugger Robot
9d836b6312 Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev 2017-08-09 20:07:48 +00:00
Makoto Onuki
ff94e0351a DropBoxManagerService: Don't store redundant information
Filenames can be calculated from other fields, so there's no need to
store them.

This will reduce the average EntryFile size from 160b to 28b, so in theory
it could save 132 KB for 1000 entries.

- Also switched from HashMap to ArrayMap, which should help a bit too.

- Also fixed unit tests and added more.

Bug: 20890386
Test: bit FrameworksServicesTests:com.android.server.DropBoxTest
Test: Boot, check the dropbox directory, run dumpsys dropbox, reboot and repeat.

Change-Id: If567750f478318acd621864d1d4ef2ed41f214bd
2017-08-09 12:07:40 -07:00
TreeHugger Robot
5f1d35ee21 Merge "Locking changes in ProcessedPackagesJournal" 2017-08-09 14:09:17 +00:00
Robert Berry
a1109ef8da Locking changes in ProcessedPackagesJournal
A follow-up CL to apply the code feedback from the first one.

Bug: 36850431
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I8785eb358658757b329ac871194243c47e6d87a9
2017-08-09 13:12:05 +01:00
Andrii Kulian
c24f373d54 Don't set inset frame for letterboxed app in fullscreen
When transitioning from split-screen to fullscreen for
letterboxed apps we were not clearing window inset frame
in some cases. This lead to incorrect mFrame calculation
and app looked like it was stuck in split screen.

This CL always clears inset frame for letterboxed app -
when task is fullscreen but app window bounds are not
empty.

Fixes: 64369819
Test: com.android.server.wm.WindowFrameTests#testLayoutLetterboxedWindow
Change-Id: I84d49642efb874caa55f2dbd8092d33e6b6f0ed4
2017-08-08 23:54:22 -07:00
Sudheer Shanka
b8f2316fb4 Update ConnOnActivityStartTest to be hermetic.
Bug: 38432755
Test: runtest -x services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
Change-Id: Ie847ec0a202021a2b2cf16bb2d720650c9ee847d
2017-08-08 22:34:46 -07:00
Todd Kennedy
f39e0569ca Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev am: 6bf2990e28
am: bc0e1e2766

Change-Id: Ie127f827fc1879dcb04f64810ff5c20446e4905a
2017-08-09 00:29:17 +00:00
TreeHugger Robot
6bf2990e28 Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev 2017-08-08 23:33:03 +00:00
Calin Juravle
b17969be5f Merge changes from topic 'info-per-split' into oc-mr1-dev am: df421a8b47
am: fe8ff8215f

Change-Id: I2ae4dd9455f34a10ddfdb368edd62f048b230d99
2017-08-08 22:57:21 +00:00
Calin Juravle
df421a8b47 Merge changes from topic 'info-per-split' into oc-mr1-dev
* changes:
  Record usage information per split
  Use PackageUseInfo in DexOptimizer
2017-08-08 22:19:32 +00:00
Todd Kennedy
5eb5a7db83 Add virtual preload bit to ApplicationInfo
Change-Id: I2735b3823a8709b2ffb65cc8085ffcd952d3e1f2
Fixes: 64205417
Test: Manual
Test: Create a sample app and install it as a normal app
Test: See that it returns 'false' for "isVirtualPreload"
Test: Create a sample app and install it as a virtual preload ["--preload"]
Test: See that it returns 'true' for "isVirtualPreload"
Test: Run sample apps after reboot and see they return the correct value
2017-08-08 13:50:07 -07:00
Calin Juravle
52a452cf68 Record usage information per split
Increase the granularity of usage information to store data on each split
separately.

Now, splits get their own useByOtherApps flag and can be compiled
speed-profile when only the primary apk is loaded by other apps.

Bug: 64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*

Change-Id: Ibf9e7b9e67db9c6f0f45dc695bce8fbeb7be20ae
2017-08-08 12:17:50 -07:00