Commit Graph

103076 Commits

Author SHA1 Message Date
Benedict Wong
edcd5ad555 Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
This reverts commit d8220c2050.

Reason for revert: Fix available for deadlocks.

Bug: 113122541
Bug: 134244752
Merged-In: Ib65214598837289bd39dbf040b56ab7835f893ba
Change-Id: Ia90bf2c72ef686e80800d113d03548e0efcadb66
(cherry picked from commit a84d9fa572)
2019-06-21 01:09:49 +00:00
Will Brockman
e320fca53a Merge "Log usage of addPerson() and setStyle() in notifications." into qt-dev
am: 029190c1bc

Change-Id: If5b6463d6c44df9660088e14b6357321c85c095d
2019-06-18 10:48:27 -07:00
TreeHugger Robot
029190c1bc Merge "Log usage of addPerson() and setStyle() in notifications." into qt-dev 2019-06-18 17:04:01 +00:00
lumark
c0ecccca16 Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev
am: b7abebde5b

Change-Id: I7459ec72287ffa36bcc11e9cce87d9a4258705d5
2019-06-18 05:32:28 -07:00
TreeHugger Robot
b7abebde5b Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev 2019-06-18 12:27:15 +00:00
Mihai Popa
104a254b1a Merge "[Magnifier-87] Fix deadlock causing ANR" into qt-dev
am: 9550c185f9

Change-Id: I0bd285dde76e8e232c119f66c5904bf1b461fb5b
2019-06-18 02:22:45 -07:00
Mihai Popa
9550c185f9 Merge "[Magnifier-87] Fix deadlock causing ANR" into qt-dev 2019-06-18 09:10:17 +00:00
Chalard Jean
5fa9d376ea Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev
am: 2ae76cdbe8

Change-Id: Ib1cb85a5864345d1367a92b2d0e3545fd8c4872e
2019-06-17 23:35:14 -07:00
TreeHugger Robot
2ae76cdbe8 Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev 2019-06-18 06:16:30 +00:00
Chalard Jean
449b9c378c Remove the <= P restriction for WIFI_P2P
This is still sent in an intent.

Bug: 131764329
Fixes: 131764329
Merged-In: I56c86b0c1912064d5a642991df32d2cefb6a8d5b
Change-Id: I64b9d632be97dc51e6085162371bb8c19f410258
(cherry picked from commit e546cb0bd16b7359feeb3c46ba52e64cf91ae4d3)
2019-06-18 06:15:58 +00:00
Julia Reynolds
fb6dd2a8c0 Merge "Use connected boolean as NLS does vs IBinder" into qt-dev
am: 23dcdcefde

Change-Id: I51f2fec6b85c4d9e3e6a5b39cd0a2e09955ec802
2019-06-17 15:16:05 -07:00
Julia Reynolds
b1f5aafc91 Use connected boolean as NLS does vs IBinder
To determine if the CPS can get/send messages. Apparently
the IBinder can be cached in ActivityManager and onBind() is not
always called when a service is connected the second time.

Test: manual; ensure a service recieves an onsubscribe for an
active rule post requestUnbind/requestRebind
Fixes: 62584038

Change-Id: Iffe37242509f3bf26e609e6b423f3928c00156ad
(cherry picked from commit 265d093cd9)
2019-06-17 17:51:18 +00:00
Mihai Popa
e42215ea70 [Magnifier-87] Fix deadlock causing ANR
Before this CL, the magnifier could deadlock when the following
happened:
1. the renderer is asked to draw (and a frame callback is provided)
2. a #dismiss() happens on the UI thread. This acquires mDestroyLock
(previously line 309)
3. InternalPopupWindow#destroy() is called, and this calls
mRenderer.destroy(). This attempts to destroy the renderer on the UI
thread, however the UI thread will wait until the pending frame callback
corresponding to step 1 is executed on the render thread.
4. The frame callback starts executing on the render thread, and tries
to acquire mDestroyLock (previously line 1093). However, this is held by
the UI thread, so a deadlock happens.

This CL completely removes mDestroyLock, relying on the existing
synchronization between the UI and render threads described in step 3.

Bug: 134584742
Test: manual testing
Change-Id: Ia4c75b5b997e0ed94d5a3814dd4507a8fffa124d
2019-06-17 11:59:20 +00:00
lumark
ca442d5d9f Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable.
Annotates InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED as @TestApi
to let cts can verify if multi-client IME enabled.

Bug: 135217809
Test: build and passes
Change-Id: Id7b4dceb2dbfaf3d7ed1084957dd14b04cad0cdf
2019-06-17 16:09:42 +08:00
bj1211jeon
2153bd3920 DO NOT MERGE: Add DENSITY_450
am: b38f168397

Change-Id: Iae2867be2b3533da492ddfc79e3006fe385742d4
2019-06-14 17:41:26 -07:00
Philip P. Moltmann
91452e14e5 Merge "Mark getProfileOwnerAsUser(int) as UnsupportedAppUsage again" into qt-dev
am: 73e04f292a

Change-Id: Ice8060926b8ae3109e1c1cc8212f3111fc72c033
2019-06-14 17:33:19 -07:00
TreeHugger Robot
5f3df7f5e0 Merge "DO NOT MERGE: Add DENSITY_450" into qt-dev 2019-06-15 00:26:09 +00:00
TreeHugger Robot
73e04f292a Merge "Mark getProfileOwnerAsUser(int) as UnsupportedAppUsage again" into qt-dev 2019-06-15 00:21:45 +00:00
bj1211jeon
b38f168397 DO NOT MERGE: Add DENSITY_450
Add 450dpi as a supported screen density.
This change follows up below change Id : Iac673eae2d82c27d96e279c076454af2f5933208

Originally 600dpi was added to support sw384 with WQHD resolution,
though it was lack of for the cases when resolution is FHD resolution. (In case of other resolutions, there already exist 300 and 200 for HD and WVGA resolutions).

Bug: 78283907
Test: run android.dpi.cts.ConfigurationTest#testScreenConfiguration and android.app.cts.ActivityManagerMemoryClassTest#testGetMemoryClass
(cherry picked from commit 13ca0450ede3eedf7d34bbd0b69525cb6ebc63f1)

Change-Id: Ide0baba183c7dea962610d16f18fecbd0dc62567
2019-06-14 15:41:13 -07:00
Philip P. Moltmann
c073e956dc Mark getProfileOwnerAsUser(int) as UnsupportedAppUsage again
As it was in P. There are no public APIs created, hence there is no
better, _public_, alternative.

Fixes: 135282729
Test: none
Change-Id: I199cfcc125f948b983eb55a199abf673cc58b7e1
2019-06-14 14:09:35 -07:00
Tim Murray
a277618a1c Merge "Revert "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows"" into qt-dev
am: 2ea2a58d97

Change-Id: I08d6b4a6f39bcc0c8982e51922f215ce729fa9c9
2019-06-14 13:24:01 -07:00
Tim Murray
2ea2a58d97 Merge "Revert "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows"" into qt-dev 2019-06-14 19:50:20 +00:00
Will Brockman
c22772c36a Log usage of addPerson() and setStyle() in notifications.
Added Tron logging to StatusBarNotification.getLogMaker() so it will
be present in most logs about the notification.

Change-Id: I720706d37c663f2018bdfe2153ad180970166c90
Test: atest android.service.notification.StatusBarNotificationTest
Bug: 135180518
2019-06-14 19:10:02 +00:00
Lucas Dupin
1cab79144c Merge "Do not let pattern be dragged" into qt-r1-dev 2019-06-14 17:25:18 +00:00
Tim Murray
4f6b8ec056 Revert "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows"
This reverts commit c18c6da441.

Reason for revert: major memory increase

Change-Id: Iffb9cd14343cd678849e487bfa163b5f23608ffd
Test: presubmit
Bug: 134695730
2019-06-14 17:16:17 +00:00
Kevin Chyn
24c57b6a70 Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev
* changes:
  Remove recalibrate notification when user enrolls
  getFaceDaemon on FaceService's own handler
  Return empty string when invalid error codes are received
2019-06-14 04:29:29 +00:00
Yiwei Zhang
74cc59e57b Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev
am: c0c88c6ed3

Change-Id: I8306fe050ef1be06b185b0a7a3183e0c5a9bdf75
2019-06-13 18:58:31 -07:00
Hui Yu
f832f61e1c Merge "Fix the missing longwake finish event problem." into qt-dev
am: eb5532eac8

Change-Id: Ie082baea99603bba6847da9cfdd959f6f5d01461
2019-06-13 18:56:06 -07:00
TreeHugger Robot
c0c88c6ed3 Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev 2019-06-14 01:36:32 +00:00
Yiwei Zhang
5229f699ee Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev
am: 45315597ff

Change-Id: I31910c4b2360e1639cfd9017db66acac67e55347
2019-06-13 18:18:22 -07:00
TreeHugger Robot
eb5532eac8 Merge "Fix the missing longwake finish event problem." into qt-dev 2019-06-14 01:03:34 +00:00
TreeHugger Robot
45315597ff Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev 2019-06-13 23:44:36 +00:00
Kevin Chyn
29692c5e8b Return empty string when invalid error codes are received
Bug: 134857990

Test: Builds
Change-Id: I2850007f5aa5a00fa3ef7d95138200a3e6cec559
2019-06-13 16:28:44 -07:00
Lucas Dupin
fc8de93eed Do not let pattern be dragged
Test: drag accross pattern
Test: start dragging from edges
Test: start drawing, drag outside the bounds
Test: repeat on small and large device
Fixes: 132687980
Change-Id: Idab9279dd7cb002cbd43aab0ce1d48f265d39f04
2019-06-13 15:48:49 -07:00
Yiwei Zhang
e3490fce00 Game Driver: Process sphal libraries in GraphicsEnvironment
Previously, there's only one Game Driver existed in the system, so we process
sphal libraries in GPU service to save the launch time for loading Game Driver.
Now we need to support a separate prerelease driver, so we have to move the
processing back to app launch time.

Bug: 134881329
Test: Manual test with prerelease driver and Settings UI.
Change-Id: Ic1bb412a6a026c68f55243c906bd56fe1fee44c3
2019-06-13 14:40:56 -07:00
Hui Yu
5b4edd6038 Fix the missing longwake finish event problem.
When starting a new batteystats history file, before inserting a new
CMD_CURRENT_TIME HistoryItem at beginning of the history
buffer, make a copy of the current HistoryItem. Otherwise the current
HistoryItem could be overriden by the CMD_CURRENT_TIME and we lose
a HistoryItem.

In b/130083227, the longwake start event happends before opening the new
history file, after CMD_CURRENT_TIME event, the longwake finish event
is missing. The fix is to make a copy of current HistoryItem before
adding CMD_CURRENT_TIME event.

Change-Id: I5048f98b6b47f54336fb01e354fb5a6284c84b43
Fix: 130083227
Test: b/130083227 can be reproduced by createFakeHistoryEvents() call,
missing longwake finish event can be seen after "TIME:" record. With the
fix, no more missing longwake finish event after "TIME:" record.
“adb shell dumpsys  batterystats --history-create-events 50000” to
create enough events to start new history files,
“adb shell dumpsys batterystats --history” to observe all history records.
2019-06-13 10:42:48 -07:00
Yiwei Zhang
17704b8d1b Merge "Game Driver: Add support for prerelease channel" into qt-dev
am: ba3f191bd5

Change-Id: I73ec6c30adf0b084a3bbb191eaf66193b2151a47
2019-06-13 08:45:37 -07:00
TreeHugger Robot
ba3f191bd5 Merge "Game Driver: Add support for prerelease channel" into qt-dev 2019-06-13 15:38:54 +00:00
Narayan Kamath
0794b46b43 Merge "Move legacy obb data migration to a handler thread." into qt-dev
am: 6d371e092e

Change-Id: I3d2ac607aa678ea7947b27d3b86a6bff9300100d
2019-06-13 02:34:06 -07:00
Narayan Kamath
6d371e092e Merge "Move legacy obb data migration to a handler thread." into qt-dev 2019-06-13 09:23:59 +00:00
Yiwei Zhang
ff9a4ee1c1 Game Driver: add support to apply prerelease driver for all apps
Bug: 134881329
Test: Manual test with prerelease driver and Settings UI.
Change-Id: I5f198b0845e9e6431066d44ef623f62e1f5c588a
2019-06-12 18:17:14 -07:00
Yiwei Zhang
45a6eae80e Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev
am: ca354f308d

Change-Id: I62ade6ba3b577080b32165c7c03ce61a66448bb3
2019-06-12 18:13:40 -07:00
Yiwei Zhang
5d0d4c6af2 Game Driver: Add support for prerelease channel
Bug: 134881329
Test: Manual test with prerelease driver.
Change-Id: I4865bbf0126df9c470aa7f1c163910eb58fb1a8b
2019-06-12 18:08:08 -07:00
TreeHugger Robot
ca354f308d Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev 2019-06-13 00:31:24 +00:00
Paul Crowley
81e014ce88 Merge "Create String before bundling AsyncTask" into qt-dev
am: 3d0fbc98f8

Change-Id: If2610098bef68780782e0a11014b97efd0f38a70
2019-06-12 16:46:17 -07:00
TreeHugger Robot
3d0fbc98f8 Merge "Create String before bundling AsyncTask" into qt-dev 2019-06-12 23:35:30 +00:00
Michael Groover
faf3e373db Merge "Remove settings to relax device ID access restrictions" into qt-dev
am: 692a68133b

Change-Id: I3312fae325c593aef750c80cbd4365dfd2669f6c
2019-06-12 14:20:22 -07:00
Michael Groover
692a68133b Merge "Remove settings to relax device ID access restrictions" into qt-dev 2019-06-12 20:31:16 +00:00
Qasid Ahmad Sadiq
f695023309 Merge "Disabled items shouldn't also be marked as unactionable." into qt-dev
am: 0963cc2418

Change-Id: I990a85b223694123bbf9114e038373253fd4f25f
2019-06-12 13:26:09 -07:00
TreeHugger Robot
0963cc2418 Merge "Disabled items shouldn't also be marked as unactionable." into qt-dev 2019-06-12 20:10:31 +00:00