Commit Graph

89222 Commits

Author SHA1 Message Date
TreeHugger Robot
c4020ffcab Merge "Mark networks with OEM_PAID always restricted" into pi-dev 2018-04-04 16:54:46 +00:00
TreeHugger Robot
a926126a8b Merge "Frameworks: In the kill handler, ensure the logging handler was run" into pi-dev 2018-04-04 15:04:37 +00:00
Tony Mak
706fbe7ed3 We should show custom title for suspend app dialog
BUG: 77523074

Test: Suspend an app, observe the new title.

Change-Id: I85f3d47e05332f7593a885130fd30dc5fd0a9960
2018-04-04 10:38:12 +00:00
TreeHugger Robot
b2e6e45d00 Merge "Throw ServiceSpecificException if calling app tries to initialize certificates with lower version. Earlier, the code just returned silently, giving no indication that updating certs failed." into pi-dev 2018-04-04 06:03:23 +00:00
Lorenzo Colitti
83c1e74b1e Mark networks with OEM_PAID always restricted
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Cherry-picked from AOSP with no conflicts

Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb)
2018-04-04 05:35:54 +00:00
Remi NGUYEN VAN
9ab1da2052 Merge "Add settings to configure default multipath quota." into pi-dev 2018-04-04 01:23:42 +00:00
TreeHugger Robot
3ec4b8ccfd Merge "Use client-side version of inTouchMode" into pi-dev 2018-04-03 23:25:34 +00:00
TreeHugger Robot
7694926d37 Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev 2018-04-03 23:17:26 +00:00
TreeHugger Robot
806be6b602 Merge "Register broadcast receiver at runtime instead" into pi-dev 2018-04-03 22:50:14 +00:00
TreeHugger Robot
5fa07c0986 Merge changes from topic "fw_quickstep_update" into pi-dev
* changes:
  Reparent recents animation task leash to app animation layer
  Allow recents animation to override divider minimized state
  Prevent unnecessary reordering of the home stack
2018-04-03 22:31:57 +00:00
TreeHugger Robot
7065aedba0 Merge "Add method to get blocked channel counts" into pi-dev 2018-04-03 22:22:24 +00:00
Eugene Susla
bd573236f8 [DO NOT MERGE] Sort A11yService#getWindows by layer descending
This is what A11yService#getWindows promises in the javadoc.

Fixes: 71581072
Test: using testback ensure the order is correct
Change-Id: I5038c4de29c60e235b65751f7bd7771ef35eb339
(cherry picked from commit f40da1a884)
2018-04-03 21:36:01 +00:00
Evan Rosky
2888404df8 Use client-side version of inTouchMode
Was bindering into WM service pretty often due to this which was
causing some jank

Bug: 72236832
Test: Related touchmode/focus CTS tests still pass
Change-Id: Ia0f89429b67464beea07c702d8fe2d8b813f8d38
2018-04-03 13:21:55 -07:00
Mike Ma
fbc01fcbd5 Register broadcast receiver at runtime instead
Cannot find class when registering Usb connection broadcast receiver
in AndroidManifest, causing system process to crash. Switch to
register receiver at runtime when boot complete.

Fixes: 77274266
Test: Manually plug & unplug usb cable, and reboot device
Test: Verify usb_data appears in batterystats dump
Test: Verify there is no crash log
Change-Id: If4a9e85aa81173ad6d8cb6ce28cc030814c520a5
2018-04-03 12:32:56 -07:00
Ruchi Kandoi
a1fc0255b8 Merge changes from topic "omapi" into pi-dev
* changes:
  Add an Executor for the onConnectedListener
  Make OMAPI stricter
2018-04-03 19:17:18 +00:00
Aseem Kumar
23174b7eae Throw ServiceSpecificException if calling app tries to initialize
certificates with lower version. Earlier, the code just returned
silently, giving no indication that updating certs failed.

Change-Id: I3eb1b9f423791a655b47b3e76c20a170e2b632c0
Bug: 77533356
Test: runtest frameworks-services -p
    com.android.server.locksettings.recoverablekeystore
2018-04-03 12:15:11 -07:00
Nathan Harold
80a2bba9a6 Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev 2018-04-03 18:24:31 +00:00
Nathan Harold
592dadbd43 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
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
2018-04-03 18:23:11 +00:00
Andreas Gampe
b1f5312c61 Frameworks: In the kill handler, ensure the logging handler was run
In the KillApplicationHandler for uncaught exceptions ensure that the
LoggingHandler has been run. This ensures logging when code directly
calls getUncaughtExceptionHandler().uncaughtException().

(cherry picked from commit 50fa122cff)

Bug: 29624607
Bug: 73380984
Test: m
Test: manual
Merged-In: I9c9216714b4cf029d7ed21e29313c0e802345337
Change-Id: I9c9216714b4cf029d7ed21e29313c0e802345337
2018-04-03 11:22:25 -07:00
TreeHugger Robot
3275d9a004 Merge "Camera: sort getCameraIdList output" into pi-dev 2018-04-03 17:13:39 +00:00
Seigo Nonaka
3a2d4143ee Merge "Make getText hidden and getWidth/getBounds public" into pi-dev 2018-04-03 15:54:49 +00:00
Julia Reynolds
f2e499d7b5 Add method to get blocked channel counts
Test: runtest systemui-notification
Bug: 72442731
Change-Id: I9ff30003edd0325f0ee0ad7154962c38523f9218
2018-04-03 09:32:15 -04:00
TreeHugger Robot
7451945364 Merge "Camera: Update external camera orientation guidelines" into pi-dev 2018-04-03 12:57:19 +00:00
Remi NGUYEN VAN
e0ec992630 Add settings to configure default multipath quota.
Bug: 72631572
Test: Tests in go/ag/3828171 pass
Change-Id: I795debd0328ea7cad32c968cb4b407928e054528
2018-04-03 17:16:29 +09:00
Sanry Huang
7a8aac8c6e Merge "android:ui crash on longpress of empty tile" into pi-dev 2018-04-03 02:22:48 +00:00
TreeHugger Robot
41d6d7c424 Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev 2018-04-03 01:55:30 +00:00
Bo Zhu
1364455fd7 Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev 2018-04-03 00:28:43 +00:00
Dmitry Dementyev
0f23660488 Revert "Throw invalid cert exception when deprecated initRecoveryService method"
This reverts commit 50bc7e42d7.

Reason for revert: API is still used by old binary

Change-Id: I3c8348211baa26245786abda6360a8df96e2d223
Bug: 77293264
2018-04-03 00:19:27 +00:00
Gil O'Neil
c610677258 Merge "Made a note that app names may not contain delimiter characters" into pi-dev 2018-04-02 23:42:01 +00:00
Remi NGUYEN VAN
cccd67b574 Merge "Fix network usage stats on 464xlat tethered." into pi-dev 2018-04-02 23:09:50 +00:00
TreeHugger Robot
4ccefebb78 Merge "Camera: fix errorFlag logic" into pi-dev 2018-04-02 23:04:42 +00:00
Bo Zhu
09856135e3 Expose the JNI scrypt function in a standalone Java class so we can
use it in RecoverableKeyStore as well

Bug: 77325751
Test: It builds. No caller code yet.

Change-Id: I6ff847cff2efbd023612e51fe35be980f27f162d
2018-04-02 15:47:08 -07:00
Mihai Popa
285797a45a Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev 2018-04-02 22:42:17 +00:00
Lorenzo Colitti
3cafea0701 Merge "Allow applications to query for foreground/background data usage." into pi-dev 2018-04-02 22:20:03 +00:00
Ruchi Kandoi
6a5809398a Add an Executor for the onConnectedListener
Test: Run CtsOmapiTestCases
Bug: 76448978
Change-Id: Ieb30b8935961db25bd058e1c41c127fa5a4437ff
2018-04-02 15:14:02 -07:00
TreeHugger Robot
0594af6dc3 Merge "Add ROLLBACK past signing cert capability." into pi-dev 2018-04-02 22:07:29 +00:00
Dianne Hackborn
886fc6aef0 Merge "Work on issue #74404949: Screen state usage API" into pi-dev 2018-04-02 20:48:51 +00:00
Daniel Cashman
629a5f9705 Add ROLLBACK past signing cert capability.
Add a new capability that may be granted to past signing certificates
after changing to a new signing certificate that will allow applications
to go back to a previous signing certificate.  This capability is
intended to not be granted, but may be added later in the event that
a signing certificate change caused undesirable behavior.

Bug: 73927694
Test: PkgInstallSignatureVerificationTest
Change-Id: I7453a2da00e740a55de45e7b144f308a9bc33772
(cherry picked from commit a1d0cf74f9)
2018-04-02 20:12:14 +00:00
TreeHugger Robot
3f6b7714a7 Merge "Don't use a copy of window params when showing a dialog." into pi-dev 2018-04-02 19:22:58 +00:00
Mihai Popa
5d983d2ba9 [Magnifier-38] Avoid deadlock causing ANR
A deadlock between the UI and render threads caused by magnifier is
currently making the running app to become not responding. The deadlock
could happen in the following scenario:
1. The UI thread sets a frame callback and asks mRenderer to sync and
draw the current frame. A draw task is enqueued by RenderProxy in the
C++ code
2. The UI thread starts an InternalPopupWindow#destroy() on the UI
thread and acquires mLock
3. mRenderer#destroy() is called on the UI thread, which enqueues a
destroy task in the C++ code. However, this is implemented
synchronously, so the UI thread will wait until the destroy task is
dequeued and executed
4. Since the draw task was enqueued before the destroy task, this will
be executed and the frame callback will be called on the render thread
5. The frame callback tries to acquire mLock. However, this is held by
the UI thread, so the render thread has to wait for it. At the same
time, the UI thread cannot progress either as it is waiting for its
destroy task to execute.

The CL adds a new lock which is used by the UI thread to mark its
intention to #destroy(), such that the render thread will know about
this before trying to acquire mLock and starving.

Bug: 75276625
Test: manual testing
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Iedf2948350fcf8dd9c819c085b31b7ccaf2db7c5
2018-04-02 18:18:55 +00:00
Andrii Kulian
38af02e75b Merge "Don't finish activity on duplicate resume request" into pi-dev 2018-04-02 17:58:42 +00:00
Sudheer Shanka
8303baf4d0 Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev 2018-04-02 17:34:16 +00:00
Felipe Leme
15d403dd6a Don't use a copy of window params when showing a dialog.
When a Dialog's show() method is called, it makes a copy (l) of its window param
and change the copy's softInputMode before calling wm.addView(). This call ends
up calling WindowManagerGlobal.addView(view, l, display, parentWindow),
which in turn sets the application token from the parentWindow into l and stores
l on its mParams map.

Later, when the dialog layout is changed (for example, if it's resized), the
original params ends up passed to WindowManagerGlobal.updateViewLayout(),
which in turn updates it's internal mParams with it, hence losing the
application token (as the token was set in the copy).

Then, when Autofill (and possibly Assist) is triggered to that activity, the
Dialog's view hierarchy is ignored because WindowManagerGlobal.getRootViews()
ignores views whose params do not have an application token.

This CL fixes this issue by passing the original dialog's param to the wm
method and resetting the softInputMode that was changed, rather than making a
copy.

Test: atest DialogLauncherActivityTest
Test: manual verification with Twitch

Fixes: 68816440

Change-Id: I55f510ab7a44030bc368221b7db1a221bc2e09c8
2018-04-02 10:07:40 -07:00
Seigo Nonaka
151108a2c6 Make getText hidden and getWidth/getBounds public
This is from advice from API review.
- make getText() hidden
- make getWidth()/getBounds() public.

Bug: 76448719
Test: atest CtsWidgetTestCases:EditTextTest
    CtsWidgetTestCases:TextViewFadingEdgeTest
    FrameworksCoreTests:TextViewFallbackLineSpacingTest
    FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
    CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
    CtsTextTestCases FrameworksCoreTests:android.text
    CtsWidgetTestCases:TextViewPrecomputedTextTest

Change-Id: Ic22a266a932cda60de6d8b37b8bbf5704291b953
2018-04-02 09:58:47 -07:00
TreeHugger Robot
7f5670fdcd Merge "Make addUnwantedCapability method public" into pi-dev 2018-04-02 15:07:25 +00:00
TreeHugger Robot
ffe1c2a266 Merge "Restore saveLayer APIs back into the public API." into pi-dev 2018-04-02 14:28:48 +00:00
Remi NGUYEN VAN
75525b39f4 Fix network usage stats on 464xlat tethered.
Usage stats corrections for 464xlat in NetworkStatsFactory are not applied
to tethered traffic. Add adjustments in NetworkStatsService. After
migrating external callers off NetworkStatsFactory, we will be able to
only apply adjustments in NetworkStatsService and remove stacked
interface tracking from NetworkStatsFactory.
Bug: 72107146
Fixes: 72107146
Test: runtest frameworks-net & manual - checked corrected network usage
Merged-In: Ieb25c41c651499fdd01225ae5ac21d95e3d823f5
Merged-In: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
(cherry-pick of aosp I5ce450e616b4fddf21f2a491fe5d0c9e9f969bda)

Change-Id: Id41cf22a0f9a63cb1832e9375bfb045861f08e52
2018-04-02 13:30:02 +00:00
Lorenzo Colitti
84b317cecf Allow applications to query for foreground/background data usage.
Currently the NetworkStatsManager APIs allow applications to
query for their own data usage by UID and tag, but do not allow
applications to query by foreground/background state.

This is causing popular apps to resort to parsing xt_qtaguid
stats files directly. Because this is no longer allowed for apps
targeting P and above, provide replacement functionality.

This API allows apps to query for data usage for a given state,
but not to receive data usage broken down by state. This is
consistent with how the current UID and tag APIs work. It is also
not an undue burden on apps: there are currently only two states
of interest (FOREGROUND and everything else), and even if we add
states in the future, unmodified apps can still obtain total
traffic using STATE_ALL.

Bug: 72977484
Test: New CTS test added in other change in this topic.
Change-Id: Ic8c9194569ffd599b49e4a8197c5c2ea0ec3f7f7
2018-04-02 19:58:24 +09:00
TreeHugger Robot
bf9dfb16be Merge "TextClassifier API updates." into pi-dev 2018-04-02 09:08:52 +00:00
Remi NGUYEN VAN
6f5a8db2e9 Merge "Add method to NetworkStatsService for UID stats." into pi-dev 2018-04-02 05:40:04 +00:00