Commit Graph

86055 Commits

Author SHA1 Message Date
Hui Yu
c35db561b8 Merge "Add RawContacts insert/update/delete notification URIs." 2018-09-22 01:16:49 +00:00
Jeffrey Vander Stoep
60871d841d Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891 am: 6729107f22
am: 904252f7a3

Change-Id: I8b8f6e74abc47f94231f3b9a1ab0db1ad0903a10
2018-09-21 15:36:28 -07:00
David Castro
cab85f3b2a Merge "docs: Removes reference to the clock displaying seconds" into pi-dev am: 02bc7c2228
am: 8bb6b0a7fc

Change-Id: I8dd5b5aa1590cf2179b03024184b283663a07df1
2018-09-21 15:17:30 -07:00
Jeffrey Vander Stoep
904252f7a3 Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891
am: 6729107f22

Change-Id: I4ec4b9a8954deec001841566e0722caa1a3fa248
2018-09-21 14:48:32 -07:00
Jeffrey Vander Stoep
6729107f22 Merge "Add ConnectivityManager.getConnectionOwnerUid()"
am: f8529dc891

Change-Id: Ib575a2a03c332d0143ed15652cc9c08c9cff694f
2018-09-21 14:26:19 -07:00
Tianjie Xu
58e024b33e Merge "Remove the metrics report in recovery system" am: aff3248507 am: 8deaf75cfd
am: acae1964ed

Change-Id: I9b61608bb34fd5658dcb2893296a04cdf4a98006
2018-09-21 14:12:30 -07:00
Jeffrey Vander Stoep
f8529dc891 Merge "Add ConnectivityManager.getConnectionOwnerUid()" 2018-09-21 21:04:20 +00:00
David Castro
8bb6b0a7fc Merge "docs: Removes reference to the clock displaying seconds" into pi-dev
am: 02bc7c2228

Change-Id: If238e952c1a923f7ac5c251c7e5c2429bf890ddd
2018-09-21 12:53:01 -07:00
TreeHugger Robot
02bc7c2228 Merge "docs: Removes reference to the clock displaying seconds" into pi-dev 2018-09-21 19:40:38 +00:00
Jeff Vander Stoep
0ac2c0945b Add ConnectivityManager.getConnectionOwnerUid()
Allow VPN apps to lookup the UID owner of a network connection.

Requires specifying the:
 - IP address and port for both the source and destination of a TCP
   connection.
 - IP address and port for either source and destination or just
   source for a UDP connection.
Only TCP and UDP protocols are supported. Only connections for UIDs
that apply to the calling VPN app will be resolved. This is intended
to replace direct app access to /proc/net/{tcp,tcp6,udp,udp6}.

The implementation uses netlink inet_diag sockets[1] to perform
the lookup on TCP sockets as well as UDP sockets when supported
(kernel has CONFIG_INET_UDP_DIAG=y).

[1] http://man7.org/linux/man-pages/man7/sock_diag.7.html

Bug: 9496886
Bug: 109758967
Test: atest HostsideVpnTests
Test: atest InetDiagSocketTest on Taimen with CONFIG_INET_UDP_DIAG
    and on Sailfish without CONFIG_INET_UDP_DIAG.
Change-Id: I2bbc7072dd091e2e653dadf6dc05024c04180f34
2018-09-21 06:16:09 +00:00
Tianjie Xu
acae1964ed Merge "Remove the metrics report in recovery system" am: aff3248507
am: 8deaf75cfd

Change-Id: Id480a047be0799d6afc7cda472b6d4e00b48ec48
2018-09-20 23:01:09 -07:00
Tianjie Xu
8deaf75cfd Merge "Remove the metrics report in recovery system"
am: aff3248507

Change-Id: I62cd28099bb20ba2927f59554c81a2fdf4075626
2018-09-20 22:35:47 -07:00
Kevin Chyn
c31c757852 Merge changes from topic "face-dialog"
* changes:
  3/n: Add FaceDialogView and "confirmation" plumbing
  2/n: Refactor common code from FingerprintDialogView
  1/n: Rename FingerprintDialogView to BiometricDialogView
2018-09-21 04:34:59 +00:00
TreeHugger Robot
e1b637d296 Merge "Make IMM#peekInstance() thread-safe" 2018-09-21 01:48:13 +00:00
Kevin Chyn
6cf54e8190 3/n: Add FaceDialogView and "confirmation" plumbing
This change adds plumbing from <Biometric>Service to SystemUI for requiring
user confirmation (or not). This change also fixes some layout bugs
that were hard to notice.

Bug: 111461540
Fixes: 113130114
Fixes: 116135579

Test: With confirmation, crypto operation does not work until token
      is added to Keystore
Test: Without confirmation, crypto operation works when biometric is
      authenticated
Test: BiometricPromptDemo works, UI elements are all correct
Test: Talkback messages are correct

Change-Id: I2c05577699a29c09777cae4db6c7334c1e6bc179
2018-09-20 17:53:10 -07:00
kopriva
b7b399ed76 Merge "docs: fixing several minor documentation bugs" into pi-dev am: 82b0d17b39
am: f6b27fbff0

Change-Id: I14f98e023001c75719ab8b891db6abf3f0fd4564
2018-09-20 17:12:29 -07:00
kopriva
f6b27fbff0 Merge "docs: fixing several minor documentation bugs" into pi-dev
am: 82b0d17b39

Change-Id: Ieb1447c0d7cda629338de8d6e03f46670d8ed0b0
2018-09-20 16:55:47 -07:00
Yohei Yukawa
3b3a2ade94 Make IMM#peekInstance() thread-safe
Somehow InputMethodManager#peekInstance() has not been thread-safe.
Although we basically do not care this deprecated method, but let's
just update it for consistency.

Bug: 115891476
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I56bf05f76a7939f004efefdd956776e533bae058
2018-09-20 15:50:35 -07:00
TreeHugger Robot
82b0d17b39 Merge "docs: fixing several minor documentation bugs" into pi-dev 2018-09-20 22:42:48 +00:00
Beverly Tai
672837464d Merge "Load default zen rules from xml" 2018-09-20 22:37:59 +00:00
Hui Yu
ff88b14e62 Add RawContacts insert/update/delete notification URIs.
Change-Id: I985377b23c1f54f3b691b4ca9094cd55a056201d
Fix: 113696451
Test: atest ContactsContract_RawContactsTest.java
2018-09-20 15:16:14 -07:00
Wale Ogunwale
e746fb17a6 Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (15/n)" 2018-09-20 21:23:15 +00:00
Nate Fischer
c1de7208ba Merge "WebView: fix TracingController example usage" into pi-dev am: 679e58a8d3
am: fc5c86fda8

Change-Id: Ib44310caef4c52c697307f345dbbf95d30647b0f
2018-09-20 14:02:58 -07:00
Nate Fischer
fc5c86fda8 Merge "WebView: fix TracingController example usage" into pi-dev
am: 679e58a8d3

Change-Id: I72c29fdc11925668a781bbff355fc1c429c2a888
2018-09-20 13:30:49 -07:00
Marcin Oczeretko
e0ef793d0a Merge changes If217a9a8,I35af3a9c
* changes:
  LooperStats - don't create entries for unsampled sessions
  Add work source uid collection to LooperStats
2018-09-20 19:43:07 +00:00
Chavi Weingarten
3623c39cd3 Merge "Remove minLayer and maxLayer from display screenshot." 2018-09-20 19:03:42 +00:00
TreeHugger Robot
679e58a8d3 Merge "WebView: fix TracingController example usage" into pi-dev 2018-09-20 18:57:55 +00:00
TreeHugger Robot
7ba1d9bbd1 Merge "Refactor: break fs-verity data gen into 2 parts" 2018-09-20 18:29:44 +00:00
kopriva
f07a46058c docs: fixing several minor documentation bugs
Test: make ds-docs

Bug: 36949243
Bug: 116169695
Bug: 37001248
Bug: 37044885
Bug: 37053166

Change-Id: I844a8978518cd7214bf9d068d602902dfa7e8246
Exempt-From-Owner-Approval: Docs-only change
2018-09-20 11:20:27 -07:00
Nate Fischer
9e39bf1067 WebView: fix TracingController example usage
This fixes a minor mistake in the TracingController class usage. The
example previously used a bare `CATEGORIES_WEB_DEVELOPER` instead of
`TracingConfig.CATEGORIES_WEB_DEVELOPER`.

Bug: 116227333
Test: make docs
Change-Id: I648dd0d5e61666e61adb27303c185013bd80b0ea
2018-09-20 18:17:05 +00:00
TreeHugger Robot
d2b1a57093 Merge "Suppress suppressing work profile removed notification if reason is null" 2018-09-20 18:06:28 +00:00
Tianjie Xu
aff3248507 Merge "Remove the metrics report in recovery system" 2018-09-20 17:39:36 +00:00
TreeHugger Robot
4435742cd1 Merge "Let IMMS be responsible for IInputMethodClient lifecycle" 2018-09-20 17:27:53 +00:00
Wale Ogunwale
53783740e3 Moved more stuff from ActivityManagerService to ActivityTaskManagerService (15/n)
- Moved CompatModePackages to ActivityTaskManagerService since it is mostly used for activity stuff.
- Moved mHeavyWeightProcess to ActivityTaskManagerService since it is set for activities.
- Set AMS.mBooting and AMS.mBooted as volatile to allow setting from both AM and WM side with hold locks.
- Allow updating of cpu stats, usage stats, and foreground time from WM side.

Bug: 80414790
Test: Existing tests pass.
Change-Id: I48ab55bdd5aacc864cb6a82d19d1a24b7605a5b0
2018-09-20 10:18:18 -07:00
Lucas Dupin
9232b57454 Merge "Clarify that UiModeManager sets global night mode" into pi-dev am: 562f5485d3
am: f255935dc8

Change-Id: Ib94e5ed781ff7b5499fd3380f16ae5e6bfefdaf7
2018-09-20 10:17:38 -07:00
Lucas Dupin
f255935dc8 Merge "Clarify that UiModeManager sets global night mode" into pi-dev
am: 562f5485d3

Change-Id: Ia757aeb7dbe97b1b33ababf50af5c96da8d7e963
2018-09-20 10:01:22 -07:00
Lucas Dupin
562f5485d3 Merge "Clarify that UiModeManager sets global night mode" into pi-dev 2018-09-20 16:39:49 +00:00
Marcin Oczeretko
ec7587283f Add work source uid collection to LooperStats
Add ThreadLocalWorkSourceUid and Message.workSourceUid
which will store the UID which caused, directly or
indirectly, the Message to be enqueued.

This was needed because using Binder.getCallingUid() does
not give us enough data since quite a few Binder services
call Binder.clearCallingIdentity() when processing the
call.

Test: UT and manual
Change-Id: I35af3a9ca5193477070990b41ff5d9c52f420069
2018-09-20 10:52:08 +01:00
daqi
ef4dda2d02 Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423f6 am: 9c5a6e2c6c" into pi-dev-plus-aosp
am: 205f5bd249

Change-Id: I69f543dc6be8383b289e61aabb5de4bd1f8f09c1
2018-09-19 20:00:44 -07:00
Felipe Leme
fa30852d6f Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev am: 971ad7aa5e
am: 5529a99f42

Change-Id: Ibdee3ee359415f684b1e30223f89b7a2dfb0ca4b
2018-09-19 19:46:51 -07:00
Android Build Merger (Role)
205f5bd249 Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423f6 am: 9c5a6e2c6c" into pi-dev-plus-aosp 2018-09-20 02:35:47 +00:00
daqi
4d5ba15e69 Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423f6
am: 9c5a6e2c6c

Change-Id: I6198c9d52c19e48f61bb4d488018c067d4b80108
2018-09-19 19:35:27 -07:00
Felipe Leme
5529a99f42 Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev
am: 971ad7aa5e

Change-Id: I3dda44262a318c277aa226321b0ed1e1dc34e6a1
2018-09-19 19:33:39 -07:00
daqi
9c5a6e2c6c Merge "Set InputMethoMananger#mCurRootView to null when window dismissed"
am: 7bd18423f6

Change-Id: Ie0127bd83b714c540bcf387a3fc74d01bd60eb13
2018-09-19 19:22:12 -07:00
Yohei Yukawa
a71bb25cff Let IMMS be responsible for IInputMethodClient lifecycle
This is the last step to remove the dependency on IInputMethodClient
from WindowManagerService.

With my previous CL [1], now WindowManagerService (WMS) depends on
IInputMethodClient just because it implements lifecycle management of
IInputMethodClient on behalf of InputMethodManagerService (IMMS).

This CL mechanically moves that responsibility from WMS to IMMS for
better separation of concerns.  It is a bit ironic that this CL is
partly undoing my previous CLs [2][3] that removed
IInputMethodManager.addClient() though.

This CL aims to preserve the current observable behavior (e.g. when
InputMethodManager instance is being created) as much as possible.
Most likely there would be no observable behavior difference when seen
from other components.

 [1]: I444077b1e4af4033f67ab72c181fac85b601e08a
      41f89c3bcc
 [2]: I453200fd5847e9a78876affb6a1caec221525e1d
      e24ed79edb
 [3]: Id91dd600120e4981aa1d9005ce644728968430c9
      fffc0e53c6

Fix: 115993358
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I7726c70613ea72d6e78fa5754e9fc840f0a40f11
2018-09-19 19:21:24 -07:00
TreeHugger Robot
971ad7aa5e Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev 2018-09-20 02:12:57 +00:00
Yuzhou Jia
35339498ef Merge "Make Changes to VoiceInteraction API for supporting System checking an assistant voice action availability on AAE." 2018-09-20 01:02:44 +00:00
Treehugger Robot
7bd18423f6 Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" 2018-09-20 00:35:25 +00:00
daqi
dff365ef4d Set InputMethoMananger#mCurRootView to null when window dismissed
InputMethodManager#sInstance is a long live static object so we have to
set its field with right value, otherwise any object referenced by it
cannot be gc including potential activity context.

Now InputMethodManager#mCurRootView is set to null in
InputMethodManager#onPreWindowFocus which is invoked when app's
ViewRootImpl received ViewRootImpl#W#windowfocusChanged from WMS.
However, in the ViewRootImpl#W#windowfocusChanged, mViewAncestor is a
weak reference which get() may returns null sometimes.
One scenario is the ViewRootImpl#W#windowfocusChanged is called after
ActivityThread#handleDestroyActivity. The activity is destroyed and its
ViewRootImpl get GC'd. Then InputMethodManager#onPreWindowFocus won't
get called and InputMethodManager#mCurRootView won't be set to null.

And it is a proper time to set InputMethodManager#mCurRootView to null
when the window it served dismissed.

Fix: 116078227
Test: Break at ActivityThread#handleDestroyActivity and ViewRootImpl#W#windowfocusChanged

Change-Id: I8fabb30f14bcb2cd7019e29b6642b4562d49d248
Signed-off-by: daqi <daqi@xiaomi.com>
2018-09-20 08:30:40 +08:00
Makoto Onuki
04f7af70f3 Merge "AMS.removeContentProviderExternal() should take a user-id" 2018-09-19 23:11:31 +00:00