Commit Graph

326489 Commits

Author SHA1 Message Date
Jason Monk
153acbcf2d Use id directly when extensions change fragments
This avoids a crash if the fragment hasn't been created yet.

Test: manual
Change-Id: I0799c50a3482c3c60fd0e27d486db5214e92f183
Fixes: 37855553
2017-06-22 10:09:29 -04:00
TreeHugger Robot
ca35ed5cb9 Merge "Merge commit '6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev 2017-06-22 13:31:45 +00:00
Erik Kline
e9b908c7a6 Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev 2017-06-22 09:31:10 +00:00
Erik Kline
562e0c17d5 Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 62343300

Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit 218c226b08)
(cherry picked from commit 798a93b0df76c4feb5ddd619b788f2cf9ea5bf77)
2017-06-22 15:28:44 +09:00
TreeHugger Robot
65a3b2ccc4 Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev 2017-06-22 03:43:48 +00:00
Winson Chung
9b91941368 Clean up dismiss target when last activity is unpinned.
Bug: 37309693
Test: Enter PIP, drag to show dismiss target, force kill application and
      ensure target is hidden.

Change-Id: Ia41f8252e32a2ff3396796562874a6c47777030d
2017-06-22 01:00:19 +00:00
Evan Laird
ea77e6e76f Merge commit '6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev
Picked up a fudge factor along a the way because of the way that the
rounded edges of oc-dr1 change the imaginary bounds of the triangle.
This should look good though.

Test: visual; runtest systemui
Change-Id: Ie79025c74bfeb136bb7f5ee7fe5604b2c12ab71e
2017-06-21 18:24:36 -04:00
Meng Wang
1b7ff89852 Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
Bug: 62647106
Test: make
Change-Id: I109f4b78446f96a5cb10e0fc84935ad180c9146c
2017-06-21 15:14:14 -07:00
TreeHugger Robot
736ba78a6e Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev 2017-06-21 21:47:35 +00:00
TreeHugger Robot
d5a305068a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-21 20:11:38 +00:00
TreeHugger Robot
52653734e3 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-21 19:50:25 +00:00
Evan Laird
6a651f81b5 Merge "Fix mobile signal icon when in airplane mode" into oc-dev 2017-06-21 19:31:28 +00:00
Evan Laird
3d1aad6475 Fix mobile signal icon when in airplane mode
1. Empty state was drawing a line too thing and not dark enough to be
seen.
2. Airplane mode should be the slashed, full signal, not the
empty one

Going into airplane mode now draws the full signal, lighter than normal,
with a slash. And the empty state now has a thicker line.

Test: runtest systemui
Fixes: 62794461
Change-Id: Ic5e40d2e0f6ebe0d270129f10883a1fcb146d717
2017-06-21 15:18:06 -04:00
Selim Cinek
3a18b28ab0 Merge "Fixed a bug where the panel could be stuck" into oc-dev
am: e8dceabd98

Change-Id: I717e03ac52383494403aaaf886e970d86bb3f3e2
2017-06-21 19:08:44 +00:00
Selim Cinek
0b9efc26f8 Merge "Fixed a a11y regression to click notifications" into oc-dev
am: b792f98446

Change-Id: Idebc4fa9cb0b2512043b0aa817a96926ec0a0d2a
2017-06-21 19:00:10 +00:00
TreeHugger Robot
e8dceabd98 Merge "Fixed a bug where the panel could be stuck" into oc-dev 2017-06-21 18:57:48 +00:00
Selim Cinek
b792f98446 Merge "Fixed a a11y regression to click notifications" into oc-dev 2017-06-21 18:48:59 +00:00
Matthew Fritze
ad8e6e8c4f Add enum to log psd bundle creation duration.
Bug:62271803
Test: None. Enum change.
Change-Id: I46921e9330542e981f7983915127832096f6bcd2
2017-06-21 11:34:59 -07:00
TreeHugger Robot
51278d6a27 Merge "Add customs accessibility actions to snooze, allow it to be focused" into oc-dr1-dev 2017-06-21 18:31:35 +00:00
TreeHugger Robot
22ec7b0c46 Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev 2017-06-21 18:26:59 +00:00
TreeHugger Robot
77dea6284a Merge "Support native shared libs" into oc-dr1-dev 2017-06-21 17:31:05 +00:00
Jean-Michel Trivi
34bc810b0b Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am: 9f1494368b

Change-Id: Ic213b2675ee5571449c74b19184da7cb91331c01
2017-06-21 17:23:30 +00:00
Jean-Michel Trivi
9f1494368b Merge "DnD: Total silence doesn't suppress A11y" into oc-dev 2017-06-21 17:15:37 +00:00
Selim Cinek
d18b86ff47 Fixed a bug where the panel could be stuck
Test: collapse the panels, let go, tap quickly, panel isn't stuck
Bug: 62602000
Change-Id: I449bcd4a6207c054eb5d536ba48ff8f05e26eb9a
2017-06-21 09:46:47 -07:00
Bill Yi
bc4ec25cce Import translations. DO NOT MERGE
Change-Id: I14ab307f4d889f07fcac2dcd529a2bf684ad99f4
Auto-generated-cl: translation import
2017-06-21 09:30:45 -07:00
Selim Cinek
751ced6c9d Fixed a a11y regression to click notifications
Test: add notification, try clicking it on the lockscreen with talkback
Change-Id: I27dd75cab6bfdff3f534c31ebfb4df7a43129a6d
Fixes: 62767220
2017-06-21 09:03:51 -07:00
Svetoslav Ganov
40610e3a14 Support native shared libs
resolve merge conflict for ac9b6706b

Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.

Test: CTS tests in this topic

bug:62720360

Change-Id: Ie3f203db12a3f3826e114c219a8341d9acab604f
2017-06-21 15:21:22 +00:00
Michael Wright
0d12f7a427 Make the log message in setInteractive a local variable.
If the error message isn't a local variable, it will go out of scope
immediately after LogIfSlow is constructed. Unfortunately, LogIfSlow
maintains a pointer to String8s internal char* member... which causes a
use after free when it goes to log. Oops.

Bug: 62820330
Test: none
Change-Id: Ie1da3be723f8aae165822002ff42954480a43aa5
2017-06-21 15:21:18 +00:00
TreeHugger Robot
592e85b4fd Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev 2017-06-21 13:23:00 +00:00
Chad Brubaker
53d87ebb55 Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
am: 88f98985d5

Change-Id: Ifd33084351941d2fe58f6534014940a18d57528f
2017-06-21 08:19:25 +00:00
TreeHugger Robot
88f98985d5 Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev 2017-06-21 08:14:12 +00:00
Erik Kline
1e54351ac0 Always allow Ethernet to be an upstream
If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 36076442

Merged-In: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03
Merged-In: Id60706e623febcc35063ccb96c797fc4f9a223b1
Merged-In: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
(cherry picked from commit 0e61baa0ac)
2017-06-21 16:41:31 +09:00
Chad Brubaker
03f85fef7f Allow Instant Apps to call getPermissionControllerPackageName
This is needed for requesting permissions to work.

Bug: 62791664
Test: Requesting a runtime permission doesn't crash the app
Change-Id: If18ac8e4c903f3804ec24df39d169fa9145f449e
2017-06-20 23:13:21 -07:00
TreeHugger Robot
104b68d0a5 Merge "Camera: remove capture session lock" into oc-dr1-dev 2017-06-21 04:21:35 +00:00
Felipe Leme
a4d103d480 Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am: 4f7fd183eb

Change-Id: Ibd7aebe46d1bb419ca33f8f38999fa9ab0d981ff
2017-06-21 04:02:27 +00:00
Felipe Leme
9cd1c52867 Fixed how FillEventHistory is reset and clarified javadoc.
am: 2e30c6f371

Change-Id: I55eb6f4a11e28ef2a8171c62848eb2b067f05ba1
2017-06-21 04:00:27 +00:00
TreeHugger Robot
4f7fd183eb Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
* changes:
  Don't add FillEventHistory events to the wrong session.
  Fixed how FillEventHistory is reset and clarified javadoc.
2017-06-21 03:45:50 +00:00
TreeHugger Robot
9e05514438 Merge "Add metric for bluetooth pairing page" into oc-dr1-dev 2017-06-21 03:16:41 +00:00
TreeHugger Robot
523c0a6a65 Merge "Add action for launching Assist Gesture settings" into oc-dr1-dev 2017-06-21 02:52:06 +00:00
Dianne Hackborn
e7de4716f0 Merge "Small doc fix." into oc-dev
am: 0f98ddaa01

Change-Id: Iac5b780a9894ce3a5433d1c434286e01313e7f99
2017-06-21 02:42:23 +00:00
Rob Carr
2f666763e9 Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
am: 70f1565b55

Change-Id: I88d205835ce91ea21d77a15649aad2d3b9c187d7
2017-06-21 02:38:55 +00:00
Svetoslav Ganov
2ff9a77549 Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
am: 324c41ba89  -s ours

Change-Id: I5f6d29e1e6d2710fe5b119d8fd1a470fbdf0d8cd
2017-06-21 02:32:45 +00:00
Bill Yi
97f536f1e5 Import translations. DO NOT MERGE
Change-Id: I05ac807711b2a21ee65abd802818491f08c886a3
Auto-generated-cl: translation import
2017-06-20 19:04:51 -07:00
TreeHugger Robot
0f98ddaa01 Merge "Small doc fix." into oc-dev 2017-06-21 01:59:02 +00:00
Yin-Chia Yeh
ec7f4c6ccd Camera: remove capture session lock
Use CameraDeviceImpl#mInterfaceLock for all device/session locking

Test: CTS/stress testing camera open/close
Bug: 62767980
Change-Id: I4e57e9e1d4548c3f9ae85799b742bebed9a0e451
2017-06-20 18:58:39 -07:00
Rob Carr
70f1565b55 Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev 2017-06-21 01:47:58 +00:00
Svetoslav Ganov
324c41ba89 Merge "[DO NOT MERGE] Support native shared libs" into oc-dev 2017-06-21 01:06:22 +00:00
jackqdyulei
2f1a359fbf Add metric for bluetooth pairing page
Bug: 38383542
Test: Build
Change-Id: Iabc31726528ce8348858cb0aabf5defecee8ea04
2017-06-20 17:46:18 -07:00
Felipe Leme
d013bcea97 Don't add FillEventHistory events to the wrong session.
The AutofillSession.getFillEventHistory() method returns only the event history
for the last onFillRequest(). In the scenario where the user switches
activities and the server has multiple sessions open, only the events for the
last session should be recorded.

Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.checkFillSelectionFromPreviousSessionIsDiscarded

Fixes: 62802026

Change-Id: I447ed77c2167095867b35d616b5cf2ae43aa28db
2017-06-20 17:31:20 -07:00
TreeHugger Robot
820a5063b4 Merge "Update jobscheduler dumpsys" into oc-dr1-dev 2017-06-20 23:46:31 +00:00