Commit Graph

13944 Commits

Author SHA1 Message Date
Kazuki Takise
661e012f51 Merge "Add always on top feature support" 2018-06-18 08:55:09 +00:00
Kazuki Takise
148d00ac93 Add always on top feature support
Add basic functionalities for always on top feature.

- Add a new flag to WindowConfiguration to represent a task wanting to
be on top.
- Update the logic on changing the z-order of windows to make sure
always on top windows are placed above other windows.

Bug: 69370884
Test: go/wm-smoke
Test: atest DisplayContentTests
Test: Used ArcCompanionLibDemo app to verify that when always-on-top is
      set, the app is above the other Android apps and Chrome windows.

Change-Id: Ie8edeb8ceeed0b9ec154b6031ed6cbe7ecc65b12
2018-06-18 14:10:31 +09:00
Wale Ogunwale
d0412b339b Switched ActivityRecord.service to ActivityTaskManagerService (5/n)
Objects that contain or represent activities like ActivityRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I7eabc9b80e494367d79ff7452c88ba82ff216bcd
2018-06-17 18:11:42 -07:00
Wale Ogunwale
6767eaee94 Split internal interface activities from current AM interface (3/n)
3rd step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the the internal interface used
to communicate within system server dealing with activities and their
containers (tasks, stack, display) from the rest of AM internal
interface.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Idad77721c1fe10621b9be5dced42a0a11f0183e5
2018-06-15 08:43:22 -07:00
Dianne Hackborn
1c4cc2d182 Merge "Expose new AppOps API that we had to leave hidden in P." 2018-06-14 23:42:46 +00:00
Xiangyu/Malcolm Chen
e448504530 Merge "Have proper permission check in getConfigForSubId" 2018-06-14 22:44:55 +00:00
Dianne Hackborn
f0c322a9db Expose new AppOps API that we had to leave hidden in P.
Now's the time!

Test: manual
Bug: 109754053
Change-Id: I06c9428b5a133be574061410b4bb7d9c589c1b7c
2018-06-14 11:44:38 -07:00
Android Build Merger (Role)
5e9763d36c Merge "Merge "Remove internal ApnSetting." into pi-dev-plus-aosp am: 1969c54ae2" 2018-06-12 22:57:51 +00:00
Pengquan Meng
0885b2d337 Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
am: 1969c54ae2

Change-Id: Ifaa873daa4bf60e5ddc9b8acef8b826ac787582a
2018-06-12 15:55:11 -07:00
Pengquan Meng
1969c54ae2 Merge "Remove internal ApnSetting." into pi-dev-plus-aosp 2018-06-12 21:38:22 +00:00
Wale Ogunwale
04d9cb5f40 Moved some activities implementation to ActivityTaskManagerService (2/n)
Second step in unifying the window hierarchy that is currently split
within AM and WM packages. We move some of the API implementation for
activities from ActivityManagerService.java to
ActivityTaskManagerService.java.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790

Change-Id: I23dcd924493d8ad1e0b6e3a55386fd72b0146605
2018-06-12 13:38:39 -07:00
TreeHugger Robot
6006f76ad7 Merge "Split interfaces and service for activities from current AM interfaces (1/n)" 2018-06-12 18:18:48 +00:00
Neil Fuller
415585f2a5 Merge "Simple pass-through TimeDetectorService"
am: cb749e2e50

Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
2018-06-12 11:17:51 -07:00
TreeHugger Robot
15f3581ca0 Merge "Use disableForUser in StatusBarManager" 2018-06-12 16:06:34 +00:00
Jeff Sharkey
273193b16d Merge "Annotate methods with SET_TIME and SET_TIME_ZONE." 2018-06-12 16:00:20 +00:00
Neil Fuller
4773b9dadc Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.

This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().

Bug: 78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit 24836bfb15)
2018-06-12 15:33:35 +01:00
yuemingw
9bf808cce1 Remove internal ApnSetting.
Bug: 77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
2018-06-12 13:56:28 +00:00
Neil Fuller
79d42a61e4 resolve merge conflicts of 5e1d95b0cc to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
2018-06-12 14:23:51 +01:00
Neil Fuller
1ed497ce1b Merge "Simple pass-through TimeDetectorService" 2018-06-12 09:49:33 +00:00
Robin Lee
63099bbc59 Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" 2018-06-12 09:06:12 +00:00
Neil Fuller
24836bfb15 Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.

Bug: 78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
2018-06-11 21:13:53 +01:00
Jeff Sharkey
d7d4ecc8ed Annotate methods with SET_TIME and SET_TIME_ZONE.
Bug: 79583362
Test: manual
Change-Id: Ic38cf49e9428917b7879d486f4a919970a2259cd
2018-06-11 14:04:24 -06:00
Makoto Onuki
8a3d990e85 Merge ""am dumpheap" is now synchronous." 2018-06-11 18:09:43 +00:00
Robin Lee
62eea67846 Do not treat EXTRA_SMALL_ICON <int> as Parcelable
It isn't one, and I should have read the documentation on it properly
before treating it the same as EXTRA_LARGE_ICON (which is indeed a
Parcelable).

This fixes a chronic outpouring of technically-probably-harmless warning
stack traces of the following nature which can be verified by running
the framework tests and grepping logcat for this scary-looking string:

  java.lang.ClassCastException: java.lang.Integer cannot be cast to
  android.os.Parcelable
    at android.os.Bundle.getParcelable(Bundle.java:***)
    at android.app.Notification.fixDuplicateExtra
    at android.app.Notification.fixDuplicateExtras
    at android.app.Notification.readFromParcelImpl

Duplicate Integer objects are harmless compared to the Bitmap so there
is zero sense in recombining the objects after an RPC. We just drop the
line which tries to do that.

Test: make FrameworksCoreTests -j30 && \
Test: adb install -r ${ANDROID_PRODUCT_OUT}/data/app/*/FrameworksCoreTests.apk && \
Test: adb shell am instrument \
Test:   -e class android.app.NotificationTest \
Test:   -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2c88ab4e9d5322c05e2e7f68df85ed5b2f296f84
Bug: 79404137
2018-06-11 17:40:56 +00:00
Makoto Onuki
2c6657f836 "am dumpheap" is now synchronous.
- Wait until the dump finishes before returning.
- Also now the filename argument is optional, with the default name of:
"/data/local/tmp/heapdump-yyyymmdd-hhmmss.prof"

Test: adb shell am dumpheap system
Test: adb shell am dumpheap system /data/local/tmp/heapdump.prof
Change-Id: I6a4c815015b731a30ffbdda5a32da541c0b790ec
Fixes: 79413767
Fixes: 62189236
2018-06-11 15:48:46 +00:00
Neil Fuller
b557907f51 Minimum viable TimeDetectorService
This is a do-nothing TimeDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit feeee682a2)
2018-06-11 15:29:57 +01:00
Xin Li
bd98091695 Skip ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge. am: f700e7feaa
am: 15bcfcf789

Change-Id: Iec38af6624b30fcdcef4a6b3df45033eb3e15588
2018-06-09 05:49:22 -07:00
nharold
b2749539c0 Merge changes from topic "ipsec-sync-with-pi"
* changes:
  Disable the AppOp Restriction for IpSec Tunnels
  Rework Exception Handling for IpSecManager
  Update IpSecManager to use InetAddress and prefixLen
  Add AppOps Checks for MANAGE_IPSEC_TUNNELS
  Add MANAGE_IPSEC_TUNNELS Permission
2018-06-08 17:07:11 +00:00
Chalard Jean
70b447a378 Merge "Opportunistic typo fix" am: 6b03498a54 am: 99cf81acac
am: 5d2bab8f63

Change-Id: Ic890e82fec41fed6dadb88c84b6aa7677a2e003b
2018-06-08 06:20:22 -07:00
Chalard Jean
5d2bab8f63 Merge "Opportunistic typo fix" am: 6b03498a54
am: 99cf81acac

Change-Id: Ie1909cb93fa6ed28e8d43a6a3849f5b4d8eec861
2018-06-08 06:08:56 -07:00
Chalard Jean
99cf81acac Merge "Opportunistic typo fix"
am: 6b03498a54

Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
2018-06-08 06:01:27 -07:00
Adam Powell
fee50a6c02 Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am: eaf3590eda" into pi-dev-plus-aosp
am: 6947fbbdd0

Change-Id: I791021aa5de1c3bf1e256c0d26c442e21c13c5ed
2018-06-07 22:46:47 -07:00
TreeHugger Robot
7231e7b6ce Merge "More conservative dark text calculation" 2018-06-08 04:33:50 +00:00
Adam Powell
f8677d0b41 Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am: eaf3590eda

Change-Id: I569a2caf105c4b6cf60b81026567ef4af7ca31c9
2018-06-07 21:18:10 -07:00
TreeHugger Robot
eaf3590eda Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev 2018-06-08 03:48:21 +00:00
Nathan Harold
21208eeccc Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.

Bug: 66955045
Test: runtest frameworks-net
Merged-In: I17a4a286225b432c3e15ea1587d946189931b4f4
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
(cherry picked from commit 592dadbd43)
2018-06-07 18:42:52 -07:00
Lucas Dupin
a291d19e47 More conservative dark text calculation
Refactored WallpaperColors to use constrast ratio instead of luminance
for detecting dark pixels. Also using a contrast more conservative than
what GAR requires while decreasing the dark area threshold.

Change-Id: I67b799be4b7ccd50bb3e63c6179d513b9b76446b
Fixes: 76435920
Test: manually set various wallpapers
Test: use new debug flag to verify which pixel is actually dark
2018-06-07 16:33:09 -07:00
Benjamin Miller
44fb336dd6 Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev am: d97f38f69c
am: 84184d72d2

Change-Id: I9640ba2eb60ac8bee7c0a377e14f1718151b5e59
2018-06-07 14:39:01 -07:00
Winson Chung
377ca939f5 Merge "Consider window background opacity when determining snapshot translucency" into pi-dev am: c6e4acc222
am: d827b1452d

Change-Id: Ic95477266bba58b1f96ccf76fbeb52442387afb9
2018-06-07 13:41:30 -07:00
Benjamin Miller
84184d72d2 Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
am: d97f38f69c

Change-Id: Icb22a68fe4402434a4dfae1856fade5219f461fc
2018-06-07 13:25:16 -07:00
Benjamin Miller
d97f38f69c Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev 2018-06-07 20:12:43 +00:00
Winson Chung
d827b1452d Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
am: c6e4acc222

Change-Id: I53f7b22ab35979d7bf0933e59985b35e0127c717
2018-06-07 12:42:09 -07:00
Chalard Jean
042be01f9e Opportunistic typo fix
Test: unneeded
Change-Id: I2f5636f3d7ea4b6e9d3e6feddfd0cb586d658813
2018-06-07 14:55:31 +09:00
Winson Chung
02378b4307 Consider window background opacity when determining snapshot translucency
Bug: 80536978
Test: Open WhatsApp conversation with IME open, hit home, go to Overview
Change-Id: I14cb15a15c2dc43229c927eda4bad3d61e568622
2018-06-06 19:40:27 -07:00
Wale Ogunwale
65ebd955e1 Split interfaces and service for activities from current AM interfaces (1/n)
First step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the interfaces and service dealing
with activities and their containers (tasks, stack, display) from the
rest of AM interfaces and services. This will allow us to move the new
interfaces and services to WM when the internal states are cleaned-up.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Ide9b3f89123b768cdbd3e3878113c7a8021187f3
2018-06-06 18:26:21 -07:00
TreeHugger Robot
56436cfc58 Merge "Allow cross user usage event queries" 2018-06-06 19:55:20 +00:00
Julia Reynolds
1b61d018ec Allow cross user usage event queries
For multipackage requests, caller must be system uid or hold
interact_across_users if not requesting fate for the same user.

For single package requests, caller must be system uid or the
same package and hold interact_across_users if not requesting data
for the current user.

In both cases the caller must have the usagestats permission.

Test: couldn't find automated tests for this file; manual
Bug: 79142791
Change-Id: I8d650f8e875e0e4578cb48c9ba42e821342852a0
2018-06-06 14:26:49 -04:00
Julia Reynolds
19b51f4fe3 Merge "Further interruptiveness changes" into pi-dev am: fe1d9dc1af
am: bbaf6a4a6f

Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0
2018-06-06 07:07:19 -07:00
Julia Reynolds
bbaf6a4a6f Merge "Further interruptiveness changes" into pi-dev
am: fe1d9dc1af

Change-Id: Ic258eaf306dc05850015808c9b67b07398575770
2018-06-06 06:58:54 -07:00
TreeHugger Robot
fe1d9dc1af Merge "Further interruptiveness changes" into pi-dev 2018-06-06 13:46:42 +00:00