Commit Graph

81245 Commits

Author SHA1 Message Date
Abodunrinwa Toki
62c135418d Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
am: d982f561cc

Change-Id: I231dd3046832556a55ea8a5eec7b288c9a199f9f
2018-03-26 23:59:02 +00:00
Dmitry Dementyev
82476a3d52 Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
am: 5b4a0d6751

Change-Id: I27700c001112a0778a3599679f46914000e36174
2018-03-26 23:26:27 +00:00
TreeHugger Robot
d982f561cc Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev 2018-03-26 23:21:37 +00:00
Dmitry Dementyev
5b4a0d6751 Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev 2018-03-26 23:07:23 +00:00
Philip P. Moltmann
895b6a19a6 Merge "Make PackageManager#getNamesForUids testable." into pi-dev
am: 9360a31f5f

Change-Id: Ie4c8cb0ffa78bd1a008aad2eae9caae6c2c0afb5
2018-03-26 22:56:01 +00:00
Tyler Gunn
8b07cc5819 Merge "Add exception catching for BlockedNumberContract methods used by Telecom." am: 13791285aa
am: 7f4c7a1b88

Change-Id: Ibc4e5312b04abd5bad43f59c66a6f48a8150760e
2018-03-26 22:39:19 +00:00
TreeHugger Robot
9360a31f5f Merge "Make PackageManager#getNamesForUids testable." into pi-dev 2018-03-26 22:36:45 +00:00
Tyler Gunn
7f4c7a1b88 Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
am: 13791285aa

Change-Id: I91280ca5ce1a146ca0635f95fb2b0d9a311778ea
2018-03-26 22:25:35 +00:00
Jason Monk
fe54f0c260 Merge "Security fixup for Slices" into pi-dev
am: fc704e2fd7

Change-Id: I7a3dfda74afdbaa1c77058b3a27c86899c1b05a3
2018-03-26 21:59:46 +00:00
Makoto Onuki
7e62948ab3 Merge "Sticky battery saver" into pi-dev
am: 110a7c20f4

Change-Id: Ieac07ecfaa0489d08a0bb9e2670da5b7e1a2d67c
2018-03-26 21:54:07 +00:00
Jason Monk
fc704e2fd7 Merge "Security fixup for Slices" into pi-dev 2018-03-26 21:44:38 +00:00
TreeHugger Robot
110a7c20f4 Merge "Sticky battery saver" into pi-dev 2018-03-26 21:41:09 +00:00
Tyler Gunn
13791285aa Merge "Add exception catching for BlockedNumberContract methods used by Telecom." 2018-03-26 21:18:54 +00:00
Chris Craik
407488584c Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev
am: d52c532df7

Change-Id: Ib503211113d175ed633a6e2045cd01938ba0d4c0
2018-03-26 20:42:10 +00:00
Martijn Coenen
c040ffd288 Merge "Add new trace tag for AIDL."
am: fe3877f140

Change-Id: I7aced8041cb8859b0a26db157e7626045e17a006
2018-03-26 20:26:18 +00:00
Chris Craik
d52c532df7 Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev 2018-03-26 20:21:04 +00:00
Dmitry Dementyev
16d9db57f5 Use Builder instead for KeyChainProtectionParams.
Use Builder to create KeyChainSnapshot it tests.
Bug: 75952916
Test: apct
Change-Id: I5ab8c864a7ccc55dafa40867ec4364a705738d86
2018-03-26 12:03:51 -07:00
Makoto Onuki
a3cd7b9d53 Sticky battery saver
- When battery saver is enabled manually (i.e. via PM.setPowerSaveMode()),
it'll stick, and we'll re-enable battery saver even after a reboot
or a charge.

- Extracted all battery saver state transition logic into a separate
class.

Fix: 75033216
Bug: 74120126
Test: Manual test with "dumpsys battery set ...."
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverStateMachineTest.java
Change-Id: If020cd48f341b339783fe09dd35bc7199e737a52
Test: dumpsys power
Test: incident_report power
Test: atest CtsBatterySavingTestCases
2018-03-26 10:27:56 -07:00
Philip P. Moltmann
abeb04ed55 Make PackageManager#getNamesForUids testable.
Fixes: 76161011
Test: atest android.content.pm.cts.PackageManagerTest
Change-Id: I857d489ec9981839d63a5b934b4aaa0d2709be85
2018-03-26 10:22:10 -07:00
Abodunrinwa Toki
520969191b Fix random SmartLinkify-related TextView bugs.
1. Preserve selection when the TC times out. (See: SelectionActionModeHelper)

2. Fix highlight/toolbar flicker when tapping on a smart link.
   - Highlight flicker happening because we reset the selection while in
     the process of starting a link action mode.
     i.e. onLinkDown: show highlight
          onLinkUp: start the link action mode asynchronously
	  onLinkUp: reset the selection to an insertion cursor*
	  onLinkActionModeStarted: reset the highlight
	  *Fix: Don't reset selection while starting a link action mode.
   - Toolbar flicker happening because the toolbar positions itself over
     the current selection. The way link highlights have traditionally
     been done is to set the selection to the links bounds*
     *Fix: Hide the toolbar for a few milliseconds when changing
     selection for smoother transition.

3. Fix Paste menu overriding link action mode toolbar after a recent
   "Copy" action. The Paste menu appearing is a feature. Whenever the
   user inserts a cursor after just copying some text, we show the Paste
   menu as a way to make it easy for the user to select the text.
   Because of the problem described in (2) above, changing the selection
   to an insertion triggers the Paste menu feature. Fixing (2) fixes
   this.

4. Fix IME popping up on non-selectable + focusable TextViews.
   See: imm.showSoftInput(...) in Editor. And see comment in the code
   around that. We should only pop up the IME for editable text.

Fixes: 73872461
Fixes: 75985239
Fixes: 76011461

Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Change-Id: If9ddb7f4e6d4db480ba4a495a22f7f2924ab937e
2018-03-26 18:11:03 +01:00
Ricky Wai
b76efd7adf Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
am: e1c76d71e7

Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
2018-03-26 17:01:45 +00:00
Ricky Wai
e1c76d71e7 Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev 2018-03-26 16:46:20 +00:00
Emilian Peev
d0d4291fef Merge changes from topic "executor_api" into pi-dev
am: 8cb2aba54d

Change-Id: I05c44edc448f83a023fe06f013433ec92b771b4d
2018-03-26 13:50:36 +00:00
Emilian Peev
f977ff992c Camera: Async camera manager calls should use executors
am: 9129aa25c1

Change-Id: Idd12695a8cdd15522d167499deb7b119d5b7db45
2018-03-26 13:46:48 +00:00
TreeHugger Robot
8cb2aba54d Merge changes from topic "executor_api" into pi-dev
* changes:
  Camera: Accept user-supplied executors in capture sessions
  Camera: Async camera manager calls should use executors
2018-03-26 13:31:30 +00:00
Benjamin Franz
ea32bc4e38 Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
am: 3ff20e2257

Change-Id: I797fd24aff1afa3e37e6b5f4dbd93042b19ac369
2018-03-26 09:29:29 +00:00
Benjamin Franz
3ff20e2257 Merge "Expose hidden API to check whether a given package is state protected" into pi-dev 2018-03-26 09:15:41 +00:00
Martijn Coenen
cd5c65a8b1 Add new trace tag for AIDL.
So we can auto-generate tracing code for AIDL interfaces.

Bug: 74416314
Test: inspect atrace output
Change-Id: I42eee24358763305d6b4e954087f3331ad20f9b7
Merged-In: I42eee24358763305d6b4e954087f3331ad20f9b7
2018-03-26 09:59:32 +02:00
Dmitry Dementyev
55d2139ec6 Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
am: a5b29ffffe

Change-Id: Ida09ae3747db332fcaa4ccb8a2bb774c96ce0caf
2018-03-26 02:43:28 +00:00
Dmitry Dementyev
a5b29ffffe Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev 2018-03-26 02:18:33 +00:00
Suprabh Shukla
b334f1b2e9 Merge "Guarding collisions in TimeSparseArray" into pi-dev
am: 6da53af9c5

Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
2018-03-24 22:49:37 +00:00
TreeHugger Robot
6da53af9c5 Merge "Guarding collisions in TimeSparseArray" into pi-dev 2018-03-24 22:36:21 +00:00
Seigo Nonaka
18f36b076d Merge "Fix BoringLayout with PrecomputedText" into pi-dev
am: 5dbb3fe124

Change-Id: Idd0927134ecf65e42ee53d0898a149ce66bc30e2
2018-03-24 21:20:11 +00:00
TreeHugger Robot
5dbb3fe124 Merge "Fix BoringLayout with PrecomputedText" into pi-dev 2018-03-24 21:03:31 +00:00
TreeHugger Robot
ca697c621e Merge "Pass all relevant resolver info to netd" into pi-dev 2018-03-24 15:58:42 +00:00
Martijn Coenen
7b436db89c Merge "Add new trace tag for AIDL." into pi-dev
am: 96b341e43a

Change-Id: I925f2dd25d8fab1ddbef77e69778b7b07c4c1120
2018-03-24 06:17:31 +00:00
Martijn Coenen
96b341e43a Merge "Add new trace tag for AIDL." into pi-dev 2018-03-24 05:58:25 +00:00
Nathan Harold
177b9bc016 Merge changes from topic "data-service-grant-policy" into pi-dev
am: 775e291c2e

Change-Id: I9e247071614faa673057335844a6d51bcbc43b8d
2018-03-24 05:13:23 +00:00
Nathan Harold
775e291c2e Merge changes from topic "data-service-grant-policy" into pi-dev
* changes:
  Add Permissions Grant for TelephonyDataService
  Add a Method to Revoke DefaultGrant Permissions
2018-03-24 05:00:42 +00:00
Erik Kline
117e7f3c76 Pass all relevant resolver info to netd
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit e5dac904d3)
2018-03-23 21:59:24 -07:00
Dmitry Dementyev
fdb48b6ebb Merge "Add more NonNull annotations to RecoveryController API" into pi-dev
am: ea97f89048

Change-Id: I53fb3b3d1aca8c3beb63f135c26c0e669e2b91cf
2018-03-24 04:01:54 +00:00
Dmitry Dementyev
49510c9b00 Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
am: 9cd3e43d86

Change-Id: Iec63cea0f5657aa763a45e7bbd8a21479459c892
2018-03-24 01:53:05 +00:00
Andrii Kulian
7558a0b30c Merge "Revert "Use transaction for local activity relaunch"" into pi-dev
am: 603b911e48

Change-Id: I9443d43e9758916eb2ec6721c1ca9992bd7b9d87
2018-03-24 01:44:46 +00:00
Android Build Merger (Role)
cd6eae6cce Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp 2018-03-24 01:22:24 +00:00
Wale Ogunwale
21315b15b7 Merge "Don't show unsupported sdk warning in test harness." into pi-dev
am: 444885b10d

Change-Id: I750ffef919badf38d759a32b1067702692d2a9c2
2018-03-24 01:21:39 +00:00
Seigo Nonaka
53145635e4 Fix BoringLayout with PrecomputedText
The special logic for PrecomputedText in BoringLayout has problem.
The special logic is no longer necessary since TextLine is now aware of
PrecomputedText. So, just removing special logic from BoringLayout.

On the other hand, the metrics parameters check in TextLine has removed
Ie73bce52c6c673cda58973ddad04627a7cf2e5e9, but that was wrong. TextLine
can be used by BoringLayout too. Thus, need to reject PrecomputedText
if the given TextPaint is not compatible with given param.

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

Change-Id: I172b5f655402e797b53b9667b49cb4ab89ec0dc0
2018-03-23 18:19:06 -07:00
Android Build Merger (Role)
361e903c66 Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp 2018-03-24 01:17:12 +00:00
Erik Kline
2b708b55a9 Merge "Pass all relevant resolver info to netd" am: 76f64641bb
am: 3ce3bc4582

Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
2018-03-24 01:16:37 +00:00
Robert Carr
beb2540414 Merge "Fix SurfaceView Background" into pi-dev
am: e3d2c41344

Change-Id: I95471b28f40446925c41a3a332f324168bbe0309
2018-03-24 01:12:02 +00:00
Erik Kline
3ce3bc4582 Merge "Pass all relevant resolver info to netd"
am: 76f64641bb

Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
2018-03-24 01:07:10 +00:00