OSDN Git Service
TreeHugger Robot [Wed, 8 Nov 2017 02:21:56 +0000 (02:21 +0000)]
Merge "Use enum class for FontVariation and update MinikinUtils"
TreeHugger Robot [Wed, 8 Nov 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Access already-read descriptors on device connect. (Eliminate extra read)"
TreeHugger Robot [Wed, 8 Nov 2017 02:14:05 +0000 (02:14 +0000)]
Merge "Fix NPE notifyActivityPinned"
TreeHugger Robot [Wed, 8 Nov 2017 02:01:25 +0000 (02:01 +0000)]
Merge changes I37d55b60,I350ec45b
* changes:
Fixes connecting to service after setup finishes for other users
Fixes service disconnect crash when changing users
Adam Vartanian [Wed, 8 Nov 2017 01:39:17 +0000 (01:39 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050 am:
2edd31e7fc am:
97ff9f9d27
am:
580feb2e37
Change-Id: I009e5d8a7b32705f3ac01f989b4e68b5fa5664ef
Adam Vartanian [Wed, 8 Nov 2017 01:13:26 +0000 (01:13 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050 am:
2edd31e7fc
am:
97ff9f9d27
Change-Id: Ied66e9bfef6708e0c03b0f97240e3a4b67780ddf
Adam Vartanian [Wed, 8 Nov 2017 00:38:27 +0000 (00:38 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050
am:
2edd31e7fc
Change-Id: Ic915bece1025d8ad8a0ed05e9b20afa9bfcdd811
TreeHugger Robot [Wed, 8 Nov 2017 00:20:40 +0000 (00:20 +0000)]
Merge "AAPT2: Better debugging output"
Adam Vartanian [Wed, 8 Nov 2017 00:15:23 +0000 (00:15 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a
am:
560fb5d050
Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
Adam Vartanian [Tue, 7 Nov 2017 23:50:35 +0000 (23:50 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba
am:
a2149abe3a
Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
Matthew Ng [Tue, 7 Nov 2017 23:46:51 +0000 (15:46 -0800)]
Fixes connecting to service after setup finishes for other users
Changed event to connect to launcher service using onUserSetupChanged
instead of onDeviceProvisionedChanged since it does not run when other
users finish setup wizard.
Test: manual - create new user and finish setup, check connection status
Change-Id: I37d55b6089ebddb0bd2ab9e5d0e0bb3fa8d73948
Fixes:
68994491
TreeHugger Robot [Tue, 7 Nov 2017 23:44:51 +0000 (23:44 +0000)]
Merge "Introduce write lock for mDragState"
Adam Vartanian [Tue, 7 Nov 2017 23:30:44 +0000 (23:30 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc
am:
eb4598afba
Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
Hugo Benichi [Tue, 7 Nov 2017 23:22:39 +0000 (23:22 +0000)]
Merge "Refactor ApfFilter creation" am:
5e619dce66 am:
6c25e1e24d
am:
55939f351b
Change-Id: Iff87d6efa0bb55c84e852a84489a0218acd21100
Adam Vartanian [Tue, 7 Nov 2017 23:04:25 +0000 (23:04 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333
am:
49dfdd66cc
Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
Hugo Benichi [Tue, 7 Nov 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Refactor ApfFilter creation" am:
5e619dce66
am:
6c25e1e24d
Change-Id: I3f406b08287092d4e2bc23f158693cea6f6646e4
TreeHugger Robot [Tue, 7 Nov 2017 22:52:39 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 22:51:37 +0000 (22:51 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 22:49:02 +0000 (22:49 +0000)]
Merge "Refactor AccessPointPreference"
Hugo Benichi [Tue, 7 Nov 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Refactor ApfFilter creation"
am:
5e619dce66
Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4
Adam Vartanian [Tue, 7 Nov 2017 22:41:48 +0000 (22:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21
am:
f61daaa333
Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
Hugo Benichi [Tue, 7 Nov 2017 22:22:19 +0000 (22:22 +0000)]
Merge "Refactor ApfFilter creation"
Seigo Nonaka [Thu, 26 Oct 2017 23:02:01 +0000 (16:02 -0700)]
Use enum class for FontVariation and update MinikinUtils
This CL contains followins:
- Use enum class FontVariation instead of legacy enum.
- Store FontStyle in MinikinPaint.
Bug:
65024629
Test: minikin_tests
Change-Id: I86bf64fd5d9a8c08eff47db851fa4655da84b1e4
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c
am:
3ac5dabc21
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
Fyodor Kupolov [Tue, 7 Nov 2017 22:04:26 +0000 (22:04 +0000)]
Merge "Revert "Fix StrictMode I/O violations""
TreeHugger Robot [Tue, 7 Nov 2017 21:58:00 +0000 (21:58 +0000)]
Merge "WifiService: Enforce permission for enableVerboseLogging"
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362
am:
240b55de2c
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Wale Ogunwale [Tue, 7 Nov 2017 21:20:53 +0000 (13:20 -0800)]
Fix NPE notifyActivityPinned
It is possible an activity is removed from it task before the
notifyActivityPinned call is processed. To avoid this we now add the
relevant information to the message before posting.
Change-Id: Ib65dee1db3033568d2385703edc92ca4bfd12549
Fixes:
68918788
Test: go/wm-smoke
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
TreeHugger Robot [Tue, 7 Nov 2017 21:09:46 +0000 (21:09 +0000)]
Merge "Expose EXTRA_SUB_ID."
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Fyodor Kupolov [Tue, 7 Nov 2017 20:38:38 +0000 (20:38 +0000)]
Revert "Fix StrictMode I/O violations"
It's causing b/
68995913
This reverts commit
18b2a13a2ec8ac93121bed0cd1f064284d3aef8b.
Change-Id: I386df4896f45b13b47e3dbf9ab842448c5e11306
TreeHugger Robot [Tue, 7 Nov 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Add method to show/hide preference in base controller"
Matthew Ng [Tue, 7 Nov 2017 19:50:36 +0000 (11:50 -0800)]
Fixes service disconnect crash when changing users
Changing users crashes system ui because service disconnected from
unprovisioned user that had no connection. Fix by always disconnecting
if connected before trying to connect to service. Requires follow up
change to have new provisioned user to connect to service.
Change-Id: I350ec45b90fa297c6ffe4932325c3b07653538f3
Fixes:
68929438
Test: manual
Jeff Sharkey [Tue, 7 Nov 2017 19:23:25 +0000 (19:23 +0000)]
Merge "Abort long-running benchmarks, report progress."
Adam Lesinski [Fri, 3 Nov 2017 22:20:17 +0000 (15:20 -0700)]
AAPT2: Better debugging output
Test: make aapt2_tests
Change-Id: I7778b773201381538dc1f2e376abee4eb33e44c0
Android Build Merger (Role) [Tue, 7 Nov 2017 19:07:07 +0000 (19:07 +0000)]
Merge "Merge "Add a carrier config indicating whether user can edit a voicemail number" am:
1f8ee4ff25 am:
e968d500f5 am:
b41fa4ead5 -s ours"
Adam Lesinski [Tue, 7 Nov 2017 19:05:22 +0000 (19:05 +0000)]
Merge "AAPT2: Add convert command"
Jordan Liu [Tue, 7 Nov 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number" am:
1f8ee4ff25 am:
e968d500f5
am:
b41fa4ead5 -s ours
Change-Id: I11e3ea6e8147556fd6dbaf8b34a8f35e498bc52d
Jordan Liu [Tue, 7 Nov 2017 18:51:57 +0000 (18:51 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number" am:
1f8ee4ff25
am:
e968d500f5
Change-Id: Ifc4a120e14dd2e2bc6f2bdfe06acfffdf6837bea
Selim Cinek [Tue, 7 Nov 2017 18:42:24 +0000 (18:42 +0000)]
Merge changes from topic "notification_messaging"
* changes:
Fixed measuring of messages with excess space
Fixed the handling of oneToOne conversations for certain apps
Improved the messaging transformation
Implemented animations for messaging changes
Refactored clipping util to be used in core
Improved the headsup notification for messages
Redesigned the messaging style
Fixed a bug where images weren't transforming properly
Jordan Liu [Tue, 7 Nov 2017 18:39:06 +0000 (18:39 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
am:
1f8ee4ff25
Change-Id: I7d86a7b3fe4348bfd148e8167b6213e9d27e67c7
Fan Zhang [Tue, 7 Nov 2017 01:54:12 +0000 (17:54 -0800)]
Add method to show/hide preference in base controller
- Reformat AbstractPreferenceController
- Also drive by fix: move UserIconDrawableTest to integ test.
Bug:
68956750
Test: robotests
Test: atest UserIconDrawableTest
Change-Id: I9812f0e169b520e56c088b325b9267e94d7fbc29
Jordan Liu [Tue, 7 Nov 2017 18:28:33 +0000 (18:28 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
TreeHugger Robot [Tue, 7 Nov 2017 18:11:14 +0000 (18:11 +0000)]
Merge "Add wide gamut trivial animation to UIBench"
TreeHugger Robot [Tue, 7 Nov 2017 17:24:27 +0000 (17:24 +0000)]
Merge "Custom message in AoD"
Fyodor Kupolov [Tue, 7 Nov 2017 17:21:50 +0000 (17:21 +0000)]
Merge "Fix StrictMode I/O violations"
TreeHugger Robot [Tue, 7 Nov 2017 17:16:48 +0000 (17:16 +0000)]
Merge "Implement assertActionModeNotStarted."
Jean-Michel Trivi [Tue, 7 Nov 2017 17:15:35 +0000 (17:15 +0000)]
Merge "AudioService: fix synchronization for camera sound enforcement"
Lucas Dupin [Tue, 7 Nov 2017 17:13:57 +0000 (17:13 +0000)]
Merge "DozeService should call super.dumpOnHandler"
TreeHugger Robot [Tue, 7 Nov 2017 17:03:32 +0000 (17:03 +0000)]
Merge "Centeralize items in a row in share sheet"
Jeff Sharkey [Mon, 6 Nov 2017 20:54:11 +0000 (13:54 -0700)]
Abort long-running benchmarks, report progress.
A typical storage device finishes the benchmark in under 10 seconds,
but some extremely slow devices can take minutes, resulting in a
confusing UX that looks like we've frozen. Even worse, we keep
churning through all that I/O even though we know the device will
blow past our user-warning threshold.
So periodically check if we've timed out, and also use that to report
progress up into the Settings UI.
Test: manual
Bug:
62201209,
65639764,
67055204
Change-Id: Id28e63a7ea1476d83184abab5aea737a1d193f3a
John Reck [Tue, 7 Nov 2017 16:29:08 +0000 (16:29 +0000)]
Merge "Remove unneeded JNI method"
Adam Vartanian [Tue, 7 Nov 2017 12:22:23 +0000 (12:22 +0000)]
Adjust Uri host parsing to use last instead of first @.
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug:
68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
TreeHugger Robot [Tue, 7 Nov 2017 15:35:16 +0000 (15:35 +0000)]
Merge "No red bars in battery saver mode"
Bill Yi [Tue, 7 Nov 2017 15:25:06 +0000 (15:25 +0000)]
Import translations. DO NOT MERGE am:
c74eab1d53 -s ours
am:
8b6d69bcbc -s ours
Change-Id: I75d3af9db6f8ec118952b52bdfc985a94fc35e30
Bill Yi [Tue, 7 Nov 2017 15:14:28 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE
am:
c74eab1d53 -s ours
Change-Id: I4af12be1568171456ad1b04bda161dadb0ab3152
Tony Mak [Tue, 7 Nov 2017 14:19:30 +0000 (14:19 +0000)]
Centeralize items in a row in share sheet
The weight sum is wrong, it should be 3 as we have 3 "SpaceLayout"
in between 4 items. Indeed, we do not need to specify weightSum
explicitly, the UI framework will do it for us.
Fix:
68978578
Test: Build and observe the padding
Change-Id: I39fc73a0cfb1b557021a9393ff92dd76340b5f22
Wale Ogunwale [Tue, 7 Nov 2017 14:46:39 +0000 (14:46 +0000)]
Merge "Removed ScreenDecorWindowTests from @Presubmit"
Wale Ogunwale [Tue, 7 Nov 2017 14:41:09 +0000 (06:41 -0800)]
Removed ScreenDecorWindowTests from @Presubmit
Test is currently flaky...
Test: this
Bug:
68957554
Change-Id: I31d4fd7e0c3f06ea942dab94067cb03dfb7f7c87
Hugo Benichi [Fri, 13 Oct 2017 07:32:20 +0000 (16:32 +0900)]
Refactor ApfFilter creation
This patch introduces a helper ApfConfiguration class for passing filter
parameters to the constructor of ApfFilter. The benefits are:
- less parameter boilerplate across IpManager, ApfFilter, ApfTest
- easier to add more parameters in the future (useful for hardware
counters options and further gservices configurable options)
There is no functional changes otherwise.
Test: runtest frameworks-net
Change-Id: I47231c21df80bc36b6d4e15369748017b50b8da1
Paul Duffin [Tue, 7 Nov 2017 11:14:53 +0000 (11:14 +0000)]
Merge "Use prebuilt android.test. stubs jars for app builds"
TreeHugger Robot [Tue, 7 Nov 2017 09:16:27 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 09:15:17 +0000 (09:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 09:02:27 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Duffin [Tue, 7 Nov 2017 07:33:11 +0000 (07:33 +0000)]
Use prebuilt android.test. stubs jars for app builds
Bug:
30188076
Test: tapas Launcher3
Change-Id: If632c39c9d98d89d597d410ebc7973903c9fa91e
Bill Yi [Tue, 7 Nov 2017 07:17:40 +0000 (23:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibe18acf5a4103db6c88d798271567497128973ed
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 7 Nov 2017 06:55:05 +0000 (22:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4818a2fc0bad121ca9bde83c9478a8734dd20c44
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 7 Nov 2017 06:45:47 +0000 (22:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic889a433a21166e4d7f4458f134bb47bb85e9ecc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 7 Nov 2017 06:44:40 +0000 (22:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8ff039bc24e3f1abf0e558d0cae23f3d8a581288
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Yifan Hong [Tue, 7 Nov 2017 06:42:12 +0000 (06:42 +0000)]
Merge "BatteryService: use @1.0::HealthInfo."
Bill Yi [Tue, 7 Nov 2017 06:40:03 +0000 (22:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4466ce0640d6c86b975fd0290ca53b592b5d27e9
Bill Yi [Tue, 7 Nov 2017 06:38:01 +0000 (22:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5c57bddf5069ac438772534c3b4dcd849f565c54
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jeff Sharkey [Tue, 7 Nov 2017 06:34:03 +0000 (06:34 +0000)]
Merge "Consistent handleApplicationStrictModeViolation."
Erik Kline [Tue, 7 Nov 2017 06:23:05 +0000 (06:23 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
8cf645c04d am:
f1799116c2
am:
76d2732ad8
Change-Id: Icba28e4d4e446dd6eac0f2f017957894e33084f2
Erik Kline [Tue, 7 Nov 2017 06:12:39 +0000 (06:12 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
8cf645c04d
am:
f1799116c2
Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
Erik Kline [Tue, 7 Nov 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
8cf645c04d
Change-Id: I421a750561ddde0afc6a70ba6369c83ab2e33571
Treehugger Robot [Tue, 7 Nov 2017 05:54:29 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Neil Fuller [Tue, 7 Nov 2017 05:42:12 +0000 (05:42 +0000)]
Change SystemApi as per API council feedback am:
a9dc4456f7
am:
c38df28c41
Change-Id: Iec0a8981ed6beef9e29e6a00781681614a5b1809
Neil Fuller [Tue, 7 Nov 2017 05:34:15 +0000 (05:34 +0000)]
Change SystemApi as per API council feedback
am:
a9dc4456f7
Change-Id: Iae3b822e08c49affc6a735adfe0fff1400b798eb
TreeHugger Robot [Tue, 7 Nov 2017 05:25:45 +0000 (05:25 +0000)]
Merge changes from topic "mediarouter_fix"
* changes:
AudioPlayerStateMonitor: fix NPE
Revert "Revert "Fix overactive media routing""
Daichi Hirono [Mon, 30 Oct 2017 01:07:24 +0000 (10:07 +0900)]
Introduce write lock for mDragState
We are going to introduce the drag drop callback however we would not
like to keep holding the window manager lock while invoking the
callback.
The CL introduce separated write lock for mDragState which we can hold
while invoking the upcoming drag and drop callback.
Bug:
65564090
Test: android.server.wm.CrossAppDragAndDropTests, manually check the
drag and drop behavior on test app.
Change-Id: Icb6484784097bc93c5aa1154c71324aa5353620c
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
TreeHugger Robot [Tue, 7 Nov 2017 04:39:36 +0000 (04:39 +0000)]
Merge "Remove libmedia_omx_defaults from libmedia"
Erik Kline [Mon, 30 Oct 2017 06:29:44 +0000 (15:29 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- SettingsLib strings used in PrivateDnsModeDialogPreference
interaction in the Settings app
- rename ContentResolver "resolver" in methods working with
DNS resolvers (too confusing)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
- no new failures in SettingsBackupTest nor in SettingsProviderTest
- manual interaction with developer option works
Bug:
34953048
Bug:
64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
TreeHugger Robot [Tue, 7 Nov 2017 03:17:12 +0000 (03:17 +0000)]
Merge changes I3afc0622,I25723107
* changes:
Make DragDropController#mDragState private
Sort out various cleanup methods of DragState
TreeHugger Robot [Tue, 7 Nov 2017 03:05:58 +0000 (03:05 +0000)]
Merge "Add unit tests for CountMetricProducer, EventMetricProducer"
Jae Shin [Mon, 30 Oct 2017 05:50:52 +0000 (14:50 +0900)]
Remove libmedia_omx_defaults from libmedia
libmedia_omx_defaults includes source files and this default was
used in both libmedia.so and libmedia_omx.so. This is an issue because
libmedia_omx and libmedia are both loaded in the framework process
through dependency chains such as libstagefright ->
libstagefright_omx_utils -> libmedia_omx.
To fix the issue, libmedia_omx_defaults is removed from libmedia and
libmedia now depends on libmedia_omx. Other modules/libs that originally
depended on libmedia and need access to libmedia_omx_defaults' source
files, now depend on libmedia_omx as well.
Bug:
67871061
Test: mma -j and boot test
Change-Id: I096d58d1e3338b70d5dae9d0f9919b908070d071
Eric Laurent [Wed, 1 Nov 2017 18:43:02 +0000 (11:43 -0700)]
AudioPlayerStateMonitor: fix NPE
Use PLAYER_STATE_UNKNOWN for state passed to
sendAudioPlayerStateChangedMessageLocked() when prevState
is null in dispatchPlaybackConfigChange()
Bug:
68748062
Test: receive a call and check ringtone
Test: passed media cts
Change-Id: I9d4c84dc1d79a72afd06d044d00f682b70c86255
TreeHugger Robot [Tue, 7 Nov 2017 02:40:35 +0000 (02:40 +0000)]
Merge "Fix robolectric test failure in settings"
Sungsoo Lim [Fri, 3 Nov 2017 02:22:35 +0000 (02:22 +0000)]
Revert "Revert "Fix overactive media routing""
This reverts commit
0aec178b7e66a29a22e90415faa15fb5f01aaef2.
Bug:
65376604
Test: manual and media cts
Change-Id: Ifd20848b406a1c51356c0b852274ba85b7062fdc
TreeHugger Robot [Tue, 7 Nov 2017 02:39:47 +0000 (02:39 +0000)]
Merge "Sim Pin layout fixes"
TreeHugger Robot [Tue, 7 Nov 2017 02:37:13 +0000 (02:37 +0000)]
Merge "Fixed the textalignment for buttons"
TreeHugger Robot [Tue, 7 Nov 2017 02:29:16 +0000 (02:29 +0000)]
Merge "SidekickService (base)"
Neil Fuller [Tue, 7 Nov 2017 02:14:58 +0000 (02:14 +0000)]
Add TimeZoneRulesDataContract to system API am:
0ab8a0d27b
am:
279828df0e
Change-Id: I3341b71fc2175f4b5916fb18deaed64b2660a0c1
Neil Fuller [Tue, 7 Nov 2017 02:05:44 +0000 (02:05 +0000)]
Add TimeZoneRulesDataContract to system API
am:
0ab8a0d27b
Change-Id: I94ad4699cc6afb98157fe7d295e9ec502a2d7d14
Fyodor Kupolov [Tue, 7 Nov 2017 01:49:13 +0000 (17:49 -0800)]
Fix StrictMode I/O violations
Bug:
68872660
Bug:
68871386
Test: manual + UserControllerTest
Change-Id: Ibc88ff4200a1ce192d096201ec6bfdf93bbfaee1