OSDN Git Service
Victor Hsieh [Wed, 2 May 2018 16:50:11 +0000 (09:50 -0700)]
Avoid using 0 for fs-verity extension ID
am:
4cf738204f
Change-Id: I66b1205decd933f27c470537af271ac50f98973a
Ryan Mitchell [Wed, 2 May 2018 16:42:11 +0000 (09:42 -0700)]
Merge "AAPT2: Fixed id parsing error" into pi-dev
am:
f4c089dd90
Change-Id: I81147ee8629edc98ba19565083c09d7dce8e6bf7
Victor Hsieh [Mon, 23 Apr 2018 21:43:19 +0000 (14:43 -0700)]
Avoid using 0 for fs-verity extension ID
Also:
* Adjust size and order of some fields
* Fix Merkle tree size calculation bug
Test: Verify fs-verity works with kernel patch
Bug:
67380979
Change-Id: I58f14cfe9630c1ff62ed64dbf333bb1c9bfe0fb1
Rohan Shah [Wed, 2 May 2018 16:32:04 +0000 (09:32 -0700)]
Merge "[Notif] Update guts/blocking helper UI" into pi-dev
am:
33b57e845f
Change-Id: Ie6d684ffb58feb5f64581e97b8fb48ee2d6ce982
Ryan Mitchell [Wed, 2 May 2018 16:27:03 +0000 (16:27 +0000)]
Merge "AAPT2: Fixed id parsing error" into pi-dev
Anton Hansson [Wed, 2 May 2018 16:25:42 +0000 (16:25 +0000)]
Merge "Update apidiff source files to use new api location." into pi-dev-plus-aosp
Rohan Shah [Wed, 2 May 2018 16:21:38 +0000 (16:21 +0000)]
Merge "[Notif] Update guts/blocking helper UI" into pi-dev
Adrian Roos [Wed, 2 May 2018 16:12:06 +0000 (09:12 -0700)]
[automerger skipped] Fix build more am:
d9d5f654c7 -s ours
am:
4b6a13ed45 -s ours
Change-Id: I702fa340b475688794ddb0e42a339f13e24b4770
Adrian Roos [Wed, 2 May 2018 16:09:14 +0000 (09:09 -0700)]
[automerger skipped] Fix build am:
3e0fd90693 -s ours
am:
fc1149dba1 -s ours
Change-Id: I6e1695d6074e6b95ea790a59a5d47be7190ac802
Adrian Roos [Wed, 2 May 2018 16:05:24 +0000 (09:05 -0700)]
[automerger skipped] OC-MR1 DisplayCutout XML API am:
361580459e -s ours
am:
14a40ac705 -s ours
Change-Id: Ieae717e3c775169cdcce0a488674fddf2c5933be
Adrian Roos [Wed, 2 May 2018 15:46:04 +0000 (08:46 -0700)]
[automerger skipped] Fix build more
am:
d9d5f654c7 -s ours
Change-Id: Id7d1d5f358c21e010530c0158ba72f4ccb8c6bf9
Adrian Roos [Wed, 2 May 2018 15:44:36 +0000 (08:44 -0700)]
[automerger skipped] Fix build
am:
3e0fd90693 -s ours
Change-Id: I814a48bdab01da6aab05b08ff58c688f4909170a
Adrian Roos [Wed, 2 May 2018 15:42:33 +0000 (08:42 -0700)]
[automerger skipped] OC-MR1 DisplayCutout XML API
am:
361580459e -s ours
Change-Id: Ibff9a5fd9396eb54264970f02c832a7d085a9648
android-build-team Robot [Wed, 2 May 2018 15:33:33 +0000 (08:33 -0700)]
Merge "Greylist updates from bugreports, Wednesday edition." into pi-dev
am:
05b5cfd453
Change-Id: I61f1e5b0aaa8c6d24b12cad341696d3f88464c92
android-build-team Robot [Wed, 2 May 2018 15:23:25 +0000 (15:23 +0000)]
Merge "Greylist updates from bugreports, Wednesday edition." into pi-dev
David Brazdil [Thu, 26 Apr 2018 13:05:13 +0000 (14:05 +0100)]
Build hidden API DEX signatures with Soong
Internal master tree is still invoking Doclava with a Makefile build
rule for hidden API, while the remaining Doclava rules have been
migrated to Soong. Do the same for hidden API.
Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: Ifa912f8751025b7de24a982a1a227a9c27d18267
(cherry picked from commit
4f9d4d566c6022f18c245380a2f6cd51957ac12a)
Mihai Popa [Wed, 2 May 2018 15:05:02 +0000 (08:05 -0700)]
Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev
am:
90f197efe5
Change-Id: I8d3b9543022686525bb2f20fcc1c8d1d6f78ff06
Mihai Popa [Wed, 2 May 2018 14:50:41 +0000 (14:50 +0000)]
Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev
android-build-team Robot [Wed, 2 May 2018 14:49:47 +0000 (07:49 -0700)]
Merge "Fix RTL TileLayout." into pi-dev
am:
12a1c46a67
Change-Id: Ie8e37229362cd3fbde7586ff6cb85b70b021bc9a
David Brazdil [Wed, 2 May 2018 14:43:11 +0000 (07:43 -0700)]
Merge non-SDK @removed API and light greylist
am:
0585533a85
Change-Id: I3b052c65e23b813f96df9a8d28fe81961bf42a7f
android-build-team Robot [Wed, 2 May 2018 14:42:49 +0000 (14:42 +0000)]
Merge "Fix RTL TileLayout." into pi-dev
David Brazdil [Wed, 2 May 2018 14:40:25 +0000 (07:40 -0700)]
[automerger skipped] Merge "Build list of @removed API's dex signatures" into pi-dev
am:
839cec4478 -s ours
Change-Id: Ic7056943f9d60b86dae56a016cb21726bbd3d488
android-build-team Robot [Wed, 2 May 2018 14:37:03 +0000 (07:37 -0700)]
Merge "Flip the cross profile apps animation" into pi-dev
am:
1bbe397856
Change-Id: I8975eff01f27d8e5c7f4e51db08a8ee3ecbfb749
David Brazdil [Wed, 25 Apr 2018 10:15:07 +0000 (11:15 +0100)]
Merge non-SDK @removed API and light greylist
@removed APIs are not part of the public SDK but we do not want
to block access to them. Use the recently added removed-dex.txt
list of @removed API signatures and merge it into the hidden API
light greylist programmatically.
Note that due to Doclava's rule precedence, @removed APIs which
override a public SDK method are considered public and are
whitelisted. We have to intersect removed-dex.txt with private-dex.txt
to satisfy the rule that light greylist is a subset of private-dex.txt.
Bug:
78182899
Test: make out/target/common/obj/PACKAGING/removed-dex.txt
Change-Id: I44e54c405fc667d54a990b9ded1de8456802545e
David Brazdil [Wed, 2 May 2018 14:28:18 +0000 (14:28 +0000)]
Merge "Build list of @removed API's dex signatures" into pi-dev
android-build-team Robot [Wed, 2 May 2018 14:24:28 +0000 (14:24 +0000)]
Merge "Flip the cross profile apps animation" into pi-dev
Mathew Inwood [Wed, 2 May 2018 14:06:06 +0000 (15:06 +0100)]
Greylist updates from bugreports, Wednesday edition.
Bug:
78309612
Bug:
78471731
Bug:
78479712
Bug:
78596948
Bug:
78786637
Bug:
78906153
Bug:
79129056
Test: m
Change-Id: I1f6eb4e8de51ebf223b6863606a0a6401be03d9d
David Brazdil [Wed, 2 May 2018 13:57:41 +0000 (13:57 +0000)]
Merge "resolve merge conflicts of
4d213e585646e35da888b9059f4d1f24c932a656 to pi-dev-plus-aosp" into pi-dev-plus-aosp
David Brazdil [Wed, 2 May 2018 13:40:17 +0000 (14:40 +0100)]
resolve merge conflicts of
4d213e585646e35da888b9059f4d1f24c932a656 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I9dc9a1e81d9a4d82823e15d1af0cc814a1005174
Nicolas Geoffray [Wed, 2 May 2018 13:30:11 +0000 (06:30 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
f90e8323ff
Change-Id: I23f86100863c719f4d6c9540545fba825f1590bf
Nicolas Geoffray [Wed, 2 May 2018 13:22:48 +0000 (13:22 +0000)]
Merge "Add more light grey APIs." into pi-dev
Daniel Sandler [Wed, 2 May 2018 13:13:53 +0000 (06:13 -0700)]
Merge "SystemUI heap monitor & hprof dump tile." into pi-dev
am:
a1c148fb1a
Change-Id: Ide8e407330aa616a74ba813dacdbd4b3262d0432
Milo Sredkov [Wed, 2 May 2018 13:06:29 +0000 (06:06 -0700)]
Merge "Keep the notification shade open for smart replies" into pi-dev
am:
f87b98880e
Change-Id: Ia5107c63863d58aa2b4d88dfb54272a811849c0a
Daniel Sandler [Wed, 2 May 2018 13:03:20 +0000 (13:03 +0000)]
Merge "SystemUI heap monitor & hprof dump tile." into pi-dev
Milo Sredkov [Wed, 2 May 2018 12:57:17 +0000 (12:57 +0000)]
Merge "Keep the notification shade open for smart replies" into pi-dev
Eran Messeri [Wed, 2 May 2018 12:41:48 +0000 (05:41 -0700)]
Merge "Save password requirements on the right user" into pi-dev
am:
f0db8fe188
Change-Id: Ibdc4a6b71b274a2da1c0d199a220c7957ffd637c
Adrian Roos [Wed, 2 May 2018 12:30:35 +0000 (12:30 +0000)]
Fix build more
Bug:
78122614
Test: m checkbuild
Change-Id: Ia69eca72a2982c6417bcd30bf806ef8c18616251
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Eran Messeri [Wed, 2 May 2018 12:31:06 +0000 (12:31 +0000)]
Merge "Save password requirements on the right user" into pi-dev
android-build-team Robot [Wed, 2 May 2018 12:18:55 +0000 (05:18 -0700)]
Merge "WindowStateAnimator: Hide preserved surface when showing new Surface" into pi-dev
am:
3ad6de6ec7
Change-Id: I6f45f302b5278e62df6a85bf7b0d51c6e5ea9604
Mihai Popa [Wed, 2 May 2018 12:13:57 +0000 (05:13 -0700)]
Merge changes I63f2b185,I0d749c1a into pi-dev
am:
724990d5ff
Change-Id: I446ae2f2247e6a0c9dca0e660e0cb6d667fab477
android-build-team Robot [Wed, 2 May 2018 12:02:46 +0000 (12:02 +0000)]
Merge "WindowStateAnimator: Hide preserved surface when showing new Surface" into pi-dev
Mihai Popa [Wed, 2 May 2018 12:02:18 +0000 (12:02 +0000)]
Merge changes I63f2b185,I0d749c1a into pi-dev
* changes:
[Magnifier-42] Fix bug in window positioning
[Magnifier-41] Fix behavior in windows with insets
David Brazdil [Wed, 2 May 2018 11:48:44 +0000 (04:48 -0700)]
Merge "Build same hidden API lists as in pi-dev"
am:
c859c8097b
Change-Id: Ie11ef705d2e921ddecb845023c039e68f9633ea3
Adrian Roos [Mon, 23 Apr 2018 16:54:37 +0000 (18:54 +0200)]
Fix build
Bug:
78122614
Test: m checkbuild
Change-Id: Ifd908fc91dc89d33a2b88fcfaed48480315991c6
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Adrian Roos [Tue, 20 Mar 2018 13:58:29 +0000 (14:58 +0100)]
OC-MR1 DisplayCutout XML API
Bug:
78122614
Test: m checkbuild
Change-Id: I974d3d4385ba66477e0932d40d0af7bcd32ddfb1
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
David Brazdil [Wed, 2 May 2018 10:45:25 +0000 (03:45 -0700)]
Merge "Publish hidden API light greylist from P" am:
0835de9e17
am:
c9993a2bb5
Change-Id: I8d77ed6ecb4004b70c0b6f97407604aa427c2151
David Brazdil [Wed, 2 May 2018 10:40:37 +0000 (10:40 +0000)]
Merge "Build same hidden API lists as in pi-dev"
Nicolas Geoffray [Wed, 2 May 2018 10:35:54 +0000 (11:35 +0100)]
Add more light grey APIs.
bug:
64382372
Test: m
Change-Id: Ia6f389ffb22f052409fc307de89cfef8d2fbeee4
David Brazdil [Wed, 2 May 2018 10:36:39 +0000 (03:36 -0700)]
Merge "Publish hidden API light greylist from P"
am:
0835de9e17
Change-Id: I6c3f41abba7c96ffa93a446fa80951e95586feb5
Mihai Popa [Mon, 30 Apr 2018 18:08:57 +0000 (19:08 +0100)]
[Magnifier-43] Refactor to remove code duplication
Since Ic5b5f6ca687db8b5d842f0ab20eac70f1fd2f85e, the magnifier can be
the child of a diffent surface than the one its content is copied from.
This initially led to much code duplication accross different methods,
making the code quite difficult to understand. This CL performs a small
refactoring, removing some of the TODOs and making the code a bit
cleaner.
Bug:
78876353
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ifa26f94ba2e4983446f058f016af6010c1017ea7
Mihai Popa [Fri, 27 Apr 2018 15:32:44 +0000 (16:32 +0100)]
[Magnifier-42] Fix bug in window positioning
The position of the magnifier surface is always clamped inside its
parent surface. As of Ic5b5f6ca687db8b5d842f0ab20eac70f1fd2f85e, we are
always trying to make the magnifier surface a child of the main
application window, if possible (before, if the magnified view was a
SurfaceView, we were making the magnifier a child of the SurfaceView's
surface). However, the CL did not also update the clamping, continuing
to clamp to the SurfaceView space when the magnified view was a
SurfaceView (even if the magnifier was child of the main window). This
was making the magnifier window to be wrongly positioned on the screen
when the magnified view is a SurfaceView. The current CL fixes this.
Bug:
78876353
Test: manual testing
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I63f2b185f58e62e8ad6eadf788e641fb1de07b04
Mihai Popa [Fri, 27 Apr 2018 12:09:12 +0000 (13:09 +0100)]
[Magnifier-41] Fix behavior in windows with insets
The CL fixes the magnifier's behavior when its parent window has
positive insets in its surface:
- we compute the content copy coordinates sent to the pixel copy request
relative to the surface the content is copied from. We were clamping
them inside the visible region of the magnified view as returned by
belonging to the view which is magnified. However, the method returns
coordinates relative to the window. Therefore, the CL offsets the
visible rectangle with the window insets, to account for them.
Otherwise, when the insets were non-zero, on a text line we were
allowing the magnifier to display content from the left outside of the
text line, while a certain region at the end of the text line could have
never been magnified
- when clamping against the visible view region, when the surface we
copy from is a SurfaceView, #getGlobalVisibleRect is still returning
coordinates relative to the main window, whereas the coordinates we are
trying to clamp are relative to the surface of the SurfaceView. In order
to make the visible rectangle relative to the surface of the SurfaceView
instead, this CL negatively offsets the visible rectangle with the
SurfaceView position in the parent surface
- the selection/insertion handles are hidden when they overlap the
magnifier. To check this, we intersect the magnifier rectangle with the
rectangle of each handle. However, when we were performing this check,
the magnifier rectangle was relative to the surface, whereas the
handles' rectangle was relative to the main window. The CL negatively
offsets the magnifier position with the surface insets, to make both
rectangles relative to the window.
Bug:
78621162
Test: manual testing
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I0d749c1abb38520fe8fc477d22d6523f470e9abc
Milo Sredkov [Tue, 1 May 2018 21:45:38 +0000 (22:45 +0100)]
Keep the notification shade open for smart replies
Currently when the user taps on a smart reply button from a locked
screen, we ask for a pattern/password and then close the notification
shade. This is inconsistent with the unlocked case and with how inline
replies are handled.
Set mLeaveOpenOnKeyguardHide to true when handling smart reply clicks.
Also simplify and rename the method in KeyguardDismissHandler to make
this new behaviour clearer.
Bug:
77841506
Test: Tap on a smart reply from the lockscreen, then unlock.
Change-Id: If1dab2a4b0d93a512c27e6d8a870289f64c7b63d
android-build-team Robot [Wed, 2 May 2018 09:20:44 +0000 (02:20 -0700)]
Merge "Remove margin from first line of remote history" into pi-dev
am:
dc617e0fb5
Change-Id: I5b1c6fe1c22fe6658959e2dda100b794fe95d6b3
android-build-team Robot [Wed, 2 May 2018 09:10:45 +0000 (09:10 +0000)]
Merge "Remove margin from first line of remote history" into pi-dev
David Brazdil [Thu, 26 Apr 2018 15:10:35 +0000 (16:10 +0100)]
Build list of @removed API's dex signatures
CL Iba8869ce6e4f401a8e420ad83ab459d25bbbaae0 added Doclava support
to generate a list of @removed API. Add a rule which builds that
list.
Bug:
78182899
Test: make out/target/common/obj/PACKAGING/removed-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Merged-In: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
Change-Id: I688c14e0d2fbfafe9ac212e6abdc3593cb744ef9
David Brazdil [Thu, 26 Apr 2018 13:05:13 +0000 (14:05 +0100)]
Build same hidden API lists as in pi-dev
P branch builds hidden API lists in a separate invocation of droiddoc
which includes @SystemApi and @TestApi annotated class members in the
public API. This patch creates the same build rule in the master branch,
only with Soong instead of Makefile.
Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
David Brazdil [Wed, 2 May 2018 08:42:49 +0000 (08:42 +0000)]
Merge "Publish hidden API light greylist from P"
android-build-team Robot [Wed, 2 May 2018 07:39:03 +0000 (00:39 -0700)]
Merge "Request focus when pin is visible" into pi-dev
am:
a74dd692aa
Change-Id: Ic632255d28d8284e4288add8f895b004d28aeec8
android-build-team Robot [Wed, 2 May 2018 07:28:33 +0000 (07:28 +0000)]
Merge "Request focus when pin is visible" into pi-dev
Dianne Hackborn [Wed, 2 May 2018 07:07:13 +0000 (00:07 -0700)]
Merge "Work on issue #
78480444: Start tracking uid state in app ops" into pi-dev
am:
55c2d4106a
Change-Id: I4d44e5aa76fc14ddb5049d617650a19d1bf9255e
Felka Chang [Wed, 2 May 2018 07:00:26 +0000 (00:00 -0700)]
Merge "Fix "Clear all" tap ripple is cut off" into pi-dev
am:
c069ad6f21
Change-Id: I8be1ffa0996eae0918064b32b261c75bcbd26472
Dianne Hackborn [Wed, 2 May 2018 06:54:54 +0000 (06:54 +0000)]
Merge "Work on issue #
78480444: Start tracking uid state in app ops" into pi-dev
Felka Chang [Wed, 2 May 2018 06:51:05 +0000 (06:51 +0000)]
Merge "Fix "Clear all" tap ripple is cut off" into pi-dev
Lucas Dupin [Mon, 30 Apr 2018 22:56:52 +0000 (15:56 -0700)]
Request focus when pin is visible
Change-Id: Idfa7f0ea7f989de95030ed9dbd0ac4b45abc8155
Fixes:
77963692
Fixes:
78187153
Fixes:
78235570
Fixes:
78887466
Test: atest tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
Test: atest tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Test: atest android.server.am.ActivityManagerDisplayLockedKeyguardTests#testDismissKeyguard_whileOccluded_secondaryDisplay
Test: atest -dt android.server.am.KeyguardLockedTests#testEnterPipOverKeyguard
Test: go/sysui-bouncer-tests
Remi NGUYEN VAN [Wed, 2 May 2018 05:45:14 +0000 (22:45 -0700)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission" into pi-dev
am:
d64c07da37
Change-Id: I77bec89592c594392e94da001f1e3992543b23ec
Remi NGUYEN VAN [Wed, 2 May 2018 05:32:43 +0000 (05:32 +0000)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission" into pi-dev
felkachang [Fri, 27 Apr 2018 08:55:40 +0000 (16:55 +0800)]
Fix "Clear all" tap ripple is cut off
The view parent of "Clear all" button's view parent is FooterView.
FooterView has the paddingEnd that is 8dp. The "Clar all" button's
view parent is a Framelayout with android:layout_width="match_parent".
Because the layout parameter of Framelayout tells FooterView
"match_parent" and FooterView's super class is ExpandableView doesn't
consider the FooterView's paddings, the "Clear all" button right
boundary is cut off by FooterView.
To use paddingStart + paddingEnd instead of 0 padding in the onMeasure
phase. After considerating the padding of Expandableview-self padding,
the children of ExpandableView doesn't have the wrong drawing area.
The left boundary of "Manage notifications" should align with the left
bottom round corner end of the notification list. The first charactor
of "Manage notifications" should align the any of the first charactor
of the notification. The alignment is 16dp defined in
notification_content_margin_start.
The right boundary of "Clear all" should align with the right bottom
round corner end of the notification list. The total of padding that
counted from right boundary of notification list to the right text
boundary should be 16dp defined in notification_content_margin_end.
Bug:
77631994
Test: atest SystemUITests
Change-Id: I64a3489891bee993a1a2a0fd29e8d65823a36d63
Android Build Merger (Role) [Wed, 2 May 2018 02:54:18 +0000 (02:54 +0000)]
Merge changes from topic "am-
b4a6d70f84a44081adc7240053891656" into pi-dev-plus-aosp
* changes:
Merge changes from topic "ifaceStats" am:
90c01b0093 am:
b86d2b4b84
Use eBPF map data for per iface stats am:
dcc56783f5 am:
2e13ecc88d
android-build-prod (mdb) [Wed, 2 May 2018 02:53:30 +0000 (19:53 -0700)]
Merge changes from topic "ifaceStats" am:
90c01b0093
am:
b86d2b4b84
Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6
android-build-team Robot [Wed, 2 May 2018 02:50:46 +0000 (19:50 -0700)]
Merge "Default keyguard scrim should be 45% transparent" into pi-dev
am:
b9b0eaff9c
Change-Id: Ie977137cd9ec717f3eee7f3c911586b29212f2ff
Chenbo Feng [Wed, 2 May 2018 02:49:53 +0000 (19:49 -0700)]
Use eBPF map data for per iface stats am:
dcc56783f5
am:
2e13ecc88d
Change-Id: If4944a4a5a0c49235731afb4ae3220cf72240a83
android-build-prod (mdb) [Wed, 2 May 2018 02:41:39 +0000 (19:41 -0700)]
Merge changes from topic "ifaceStats"
am:
90c01b0093
Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
android-build-team Robot [Wed, 2 May 2018 02:40:06 +0000 (02:40 +0000)]
Merge "Default keyguard scrim should be 45% transparent" into pi-dev
Chenbo Feng [Wed, 2 May 2018 02:36:30 +0000 (19:36 -0700)]
Use eBPF map data for per iface stats
am:
dcc56783f5
Change-Id: I9d6b930c8bb20f0bffd8eecee56ea7d3081b6f54
Remi NGUYEN VAN [Wed, 25 Apr 2018 08:46:10 +0000 (17:46 +0900)]
Add NETWORK_BYPASS_PRIVATE_DNS permission
Have the captive portal app and the MMS service use this new permission
to bypass private DNS.
Bug: b/
78494660
Test: manual: captive portal login & MMS sending works
Change-Id: I0a4a8d0105becf6957fd44099bd84eca51e6716f
android-build-team Robot [Wed, 2 May 2018 01:23:06 +0000 (01:23 +0000)]
Merge "rename hidl_enum_{iterator,range}" into pi-dev-plus-aosp
android-build-prod (mdb) [Wed, 2 May 2018 01:19:23 +0000 (01:19 +0000)]
Merge changes from topic "ifaceStats"
* changes:
Remove the unused file parsing function
Use eBPF map data for per iface stats
android-build-team Robot [Wed, 2 May 2018 00:56:08 +0000 (17:56 -0700)]
Merge "Reduce statsd log data size." into pi-dev
am:
b85e5616df
Change-Id: Id60db7bd29b103194904b8bdf5fc1b788cf7efc2
android-build-team Robot [Wed, 2 May 2018 00:45:51 +0000 (00:45 +0000)]
Merge "Reduce statsd log data size." into pi-dev
android-build-team Robot [Wed, 2 May 2018 00:40:12 +0000 (17:40 -0700)]
Merge "Fixes primary stack being visible when minimizing 3rd party launcher" into pi-dev
am:
f841f8190a
Change-Id: Ie577a317afc304fc1ea8c69f668c77df7f7163f8
Dianne Hackborn [Thu, 26 Apr 2018 20:46:22 +0000 (13:46 -0700)]
Work on issue #
78480444: Start tracking uid state in app ops
Introduce new app op mode that uses uid state to determine whether
the caller has access. This will determine what noteOp() and
startOp() return, based on the state of the uid.
Bug:
78480444
Test: atest FrameworksServicesTests:AppOpsServiceTest
Test: atest CtsPermissionTestCases:AppOpsTest
Change-Id: I12b744b74f3129782dbda9567043f5170919b5d3
Merged-In: I55fd74023cc4dae8151372e28c3afc7d259c7a1c
Michael Wachenschwanz [Wed, 2 May 2018 00:35:00 +0000 (17:35 -0700)]
Merge "Add Stable Charging Threshold for AppStandby" into pi-dev
am:
b3972f9d23
Change-Id: Iacdddabdd58c0da6b53d997b08ddf70bef583392
android-build-team Robot [Wed, 2 May 2018 00:27:20 +0000 (00:27 +0000)]
Merge "Fixes primary stack being visible when minimizing 3rd party launcher" into pi-dev
Michael Wachenschwanz [Wed, 2 May 2018 00:23:23 +0000 (00:23 +0000)]
Merge "Add Stable Charging Threshold for AppStandby" into pi-dev
android-build-team Robot [Wed, 2 May 2018 00:09:29 +0000 (17:09 -0700)]
Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev
am:
da8e229b9c
Change-Id: Ieb7af6054401ff75f91b59690708e358ff36f773
Steven Moreland [Tue, 1 May 2018 23:54:00 +0000 (16:54 -0700)]
rename hidl_enum_{iterator,range}
This is actually a range, not an iterator.
Bug:
78573628
Test: m
Change-Id: Iee444b9580de39ebad105165173093c6099df062
android-build-team Robot [Tue, 1 May 2018 23:56:12 +0000 (23:56 +0000)]
Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev
Kevin Chyn [Tue, 1 May 2018 23:36:18 +0000 (16:36 -0700)]
Merge "refactored Log statements to Slog" into pi-dev
am:
14de2930ba
Change-Id: If23e985babd71cacd1e312b26e81c006d8246eb1
Brad Ebinger [Tue, 1 May 2018 23:25:34 +0000 (16:25 -0700)]
Merge "Clean up old Context references in ImsConfig" into pi-dev
am:
65ac70515f
Change-Id: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3
Kevin Chyn [Tue, 1 May 2018 23:22:09 +0000 (23:22 +0000)]
Merge "refactored Log statements to Slog" into pi-dev
Brad Ebinger [Tue, 1 May 2018 23:10:40 +0000 (23:10 +0000)]
Merge "Clean up old Context references in ImsConfig" into pi-dev
Selim Cinek [Tue, 1 May 2018 23:03:28 +0000 (16:03 -0700)]
Merge "Fixed an issue where the messaging layout could appear empty" into pi-dev
am:
1e543887f5
Change-Id: I0bfda0c9b5700f5d1d27133b0ac9b7d8640d4e60
Selim Cinek [Tue, 1 May 2018 22:58:01 +0000 (15:58 -0700)]
Merge "Fixed the messaging clipping for RTL languages" into pi-dev
am:
7a1e03a5fb
Change-Id: I4f34b801ccf02dce2d4d7892da2bd70a3f8f165a
Matthew Ng [Tue, 1 May 2018 21:24:38 +0000 (14:24 -0700)]
Fixes primary stack being visible when minimizing 3rd party launcher
When using 3rd party launcher, the home stack is not merged with
overview then when minimizing, it will not be secondary split screen
stack. Then the primary stack will be presumed invisible even though
it is on the screen. The added check will make sure that the docked
stack is visible when minimizing.
Test: use 3rd party launcher, minimize
Change-Id: I5837ac6339352cae926c970f7453f5564abafb70
Fixes:
77818300
Ryan Mitchell [Tue, 1 May 2018 22:47:12 +0000 (15:47 -0700)]
Merge "RRO: Don't update overlays when target changes" into pi-dev
am:
714184f42e
Change-Id: I4d121d90efceccce2abe47bfc625d65d5377c0a7
Lucas Dupin [Tue, 1 May 2018 22:43:06 +0000 (15:43 -0700)]
Default keyguard scrim should be 45% transparent
Wallpapers were barely visible on lock screen because value was set to
70%. The unlocked scrim (on the notification shade) was kept at 70% to
improve readability.
Also fixed a bug where scrim opacity wouldn't be overridden via overlay.
Bug:
63868547
Test: visual
Test: atest ScrimControllerTest
Change-Id: I17f277c917dc55604762420c0027b552993f1916
Selim Cinek [Tue, 1 May 2018 22:42:53 +0000 (22:42 +0000)]
Merge "Fixed an issue where the messaging layout could appear empty" into pi-dev
Selim Cinek [Tue, 1 May 2018 22:38:09 +0000 (22:38 +0000)]
Merge "Fixed the messaging clipping for RTL languages" into pi-dev
Ryan Mitchell [Tue, 1 May 2018 22:35:38 +0000 (22:35 +0000)]
Merge "RRO: Don't update overlays when target changes" into pi-dev