Commit Graph

74854 Commits

Author SHA1 Message Date
Andrei Stingaceanu
ddb8ced959 Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev
am: 04b6095082

Change-Id: I1467a1af9a9bc0c23435b1e3b34a4ac257b9244c
2017-09-11 09:44:47 +00:00
Andrei Stingaceanu
04b6095082 Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev 2017-09-11 09:39:22 +00:00
Yohei Yukawa
b0b685bab7 Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev
am: a729236399

Change-Id: Ibc4e2f176cd46b6de4cc6f6e6f28e3309a00f1a2
2017-09-10 05:39:50 +00:00
TreeHugger Robot
a729236399 Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev 2017-09-10 05:31:42 +00:00
Felipe Leme
4cefd85dd0 Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev
am: beff427903

Change-Id: I3281358455bae103eb8e5f9f8d375f44dd0a4803
2017-09-10 04:44:18 +00:00
TreeHugger Robot
beff427903 Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev 2017-09-10 04:37:35 +00:00
Yohei Yukawa
9309c19513 Revert "Remove a compat hack SurfaceView#setWindowType()"
This CL reverts my previous CL [1] that aimed to get rid of
a nasty compatibility hack that was introduced for Bug 36345857.

For those who are interested in, what happenned are:

 1. @hide method SurfaceView#setWindowType() was removed [2].
 2. It broke some app (Bug 36345857).  We had to work around
    it by re-introducing SurfaceView#setWindowType()
    temporarily [3].
 3. Some app switched to the correct implementation when
    running on Android O devices.
 4. We removed that compatibility hack [1] (Bug 62054282).
 5. Android O MR1 is set to be "REL" [4].
 6. It broke some app, probably because of some unfortunate
    mistake in the version check logic in that app.
 7. We end up introducing the same hack again for O MR1.

 [1]: Icee198c554de558cfa4ffe0b264064969839654e
      7a1ad6d97c
 [2]: Ie56b6f7ab16f32d7fc459b8eba26594337ad55de
      d5c7dd6da8
 [3]: I5217f6417a73690ae8a978754218b7b089070fdd
      3b5011afc9
 [4]: I054e3ecff49803e61e7741753fe6764a567d72c4
      62a835d0ef89e51f4a97fecf8576224551b545a5

Bug: 36345857
Bug: 62054282
Fixes: 65508814
Test: Manually verified that Bug 65508814 is not reproducible
Change-Id: If8a3f726789daa22f73e1962e938f071d3c09414
2017-09-09 17:45:27 -07:00
Felipe Leme
c59aef08fb Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev
am: 627cc3c7ae

Change-Id: I04fa1c1c89c8bd31eb99ffd9bfd56ee00ee63dd8
2017-09-09 09:13:07 +00:00
TreeHugger Robot
627cc3c7ae Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev 2017-09-09 09:04:39 +00:00
Felipe Leme
a669df1b6c Merge "Added more logging to diagnose a racy runtime restart." into oc-mr1-dev
am: 09545e3fa7

Change-Id: Icdc462cabbba4b62935a9a62635831ed5f9cb1ec
2017-09-09 04:18:04 +00:00
TreeHugger Robot
09545e3fa7 Merge "Added more logging to diagnose a racy runtime restart." into oc-mr1-dev 2017-09-09 04:01:35 +00:00
Phil Weaver
fecc0a6d60 Merge "Don't call disconnected AccessibilityServices" into oc-mr1-dev
am: 17788eb4b1

Change-Id: Ifea6164d4329596fb8b22e50c8cfa8e56ce47e00
2017-09-09 00:26:17 +00:00
Calin Juravle
b2e1a3cbc2 Merge "Handle configuration splits when creating the class loader context" into oc-mr1-dev
am: ed54b41e3c

Change-Id: I34d37f77255226ec46bb833b64d8196b746f413e
2017-09-09 00:00:14 +00:00
Yin-Chia Yeh
811029f71d Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev
am: f23334869d

Change-Id: I0c3c9544e37219110178c864ff2ec6b28b467f63
2017-09-08 23:34:27 +00:00
Felipe Leme
210485221c Merge "Javadoc: Added alternative to Package verification." into oc-dev am: 092349600d am: 33d476c170
am: 66e3c9aaf8

Change-Id: I07156ab1aec1415ed3c484da0fe3567896c073b7
2017-09-08 22:00:59 +00:00
Phil Weaver
17788eb4b1 Merge "Don't call disconnected AccessibilityServices" into oc-mr1-dev 2017-09-08 21:56:38 +00:00
Calin Juravle
ed54b41e3c Merge "Handle configuration splits when creating the class loader context" into oc-mr1-dev 2017-09-08 21:55:28 +00:00
Felipe Leme
bc1af42171 Merge "Javadoc: Added alternative to Package verification." into oc-dev am: 092349600d
am: 33d476c170

Change-Id: I59c6ddc48fad9178b03c7a1da7957238d4045ea7
2017-09-08 21:51:51 +00:00
Felipe Leme
66e3c9aaf8 Merge "Javadoc: Added alternative to Package verification." into oc-dev am: 092349600d
am: 33d476c170

Change-Id: I6a72e1c2399fd03cd87de61964fc07e0329a8eb9
2017-09-08 21:50:25 +00:00
TreeHugger Robot
f23334869d Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev 2017-09-08 21:48:08 +00:00
Felipe Leme
33d476c170 Merge "Javadoc: Added alternative to Package verification." into oc-dev
am: 092349600d

Change-Id: Ic765df95fc660fb0df8a0f027d739ea999a36702
2017-09-08 21:41:36 +00:00
TreeHugger Robot
092349600d Merge "Javadoc: Added alternative to Package verification." into oc-dev 2017-09-08 21:28:02 +00:00
Vinay Kalia
ce784381fd Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e am: be7ccdf6e9
am: 4b0748ffda

Change-Id: Icad06975358e4814a3f05a363a41a7a77511bd88
2017-09-08 20:26:37 +00:00
Vinay Kalia
4b0748ffda Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e
am: be7ccdf6e9

Change-Id: Ib66ed6d6d6e9e1766fa4ed495d3d045b8a6384fe
2017-09-08 20:06:55 +00:00
Vinay Kalia
be7ccdf6e9 Merge "Update ScanSettings documentation for scan modes"
am: 8157ab2a0e

Change-Id: I15a77489072925f6e99e9a0a658910616164aef3
2017-09-08 19:58:33 +00:00
Vinay Kalia
8157ab2a0e Merge "Update ScanSettings documentation for scan modes" 2017-09-08 19:50:36 +00:00
Andrew Scull
07f6b5581a Merge "OemLockService: remove canUserAllowOemUnlock()" into oc-mr1-dev
am: 5664b30008

Change-Id: Ie38c731b4e1119e8cef707cd58e4f32ab68a7d1b
2017-09-08 19:34:42 +00:00
Felipe Leme
7f3510110c Merge "Fixed CharSequenceTransformation to use find() instead of matches()." into oc-mr1-dev
am: 48bf1ca5d4

Change-Id: Ifa0152751e37cb8032efa6a7d5f191db2834d0e5
2017-09-08 19:23:36 +00:00
TreeHugger Robot
5664b30008 Merge "OemLockService: remove canUserAllowOemUnlock()" into oc-mr1-dev 2017-09-08 19:08:47 +00:00
TreeHugger Robot
48bf1ca5d4 Merge "Fixed CharSequenceTransformation to use find() instead of matches()." into oc-mr1-dev 2017-09-08 19:08:06 +00:00
Yin-Chia Yeh
8cd12e9b7c Camera: fix race in onRepeatingRequestError callback
Test: CTS
Bug: 64180296
Change-Id: I72b76695d580d2cfddb02a6da9d7ab04cdcfb98a
2017-09-08 11:30:27 -07:00
Felipe Leme
63f7906c1d Don't log TYPE_DATASET_SELECTED on dataset authentication.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 65007529
Fixes: 65403592

Merged-In: I98f1198cbe1836c8154b73a1227be4f6947abc19
Change-Id: I98f1198cbe1836c8154b73a1227be4f6947abc19
2017-09-08 17:10:38 +00:00
Andrew Scull
85be690734 OemLockService: remove canUserAllowOemUnlock()
No longer used by Settings as the logic was wrong.

Test: gts-tradefed run gts -m GtsOemLockServiceTestCases
Bug: 65124732
Change-Id: I44e5f697aabd2b5eefecf64060502b5c9ef5f911
(cherry picked from commit d37fe2d3e1)
2017-09-08 16:07:55 +00:00
Andrei Stingaceanu
4303f22535 TextView longpress 2 haptic feedback fix
TextView#performLongClick() calls View#performLongClick which
calls View#performLongClickInternal() which, if handled, performs
the longpress haptic feedback and returns handled. TextView
looks at this return value and if it is true then makes another
call to perform longpress haptic feedback. Remove the duplicate
call in TextView as the one in the parent (View) is sufficient.

Bug: 65397911
Test: manual
Change-Id: Ic73a86637486d5382b63f1c1b37783e238452841
2017-09-08 11:18:56 +00:00
Hugo Benichi
faf8348ad3 NetworkStats: more robust subtraction for deltas
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.

When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.

This is what's expected by NetworkStatsHistory#recordData().

Bug: 64365917
Bug: 65439160
Test: runtest frameworks-net
Merged-In: I16e97e73f600225f80e0ce517e80c07c6f399196
Merged-In: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
Merged-In: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
Merged-In: Ib488fb034f72c92f19916490981342a3ef2eb33b

(cherry picked from commit ad5e2827ea)

Change-Id: Ic86b65a65a2517c871221f8784088ec1de18f534
2017-09-08 13:39:44 +09:00
Sujith Ramakrishnan
399f9b83bc Merge "Make ASSIST launch VIS and add a new keycode for TV (ALL_APPS)" into oc-mr1-dev
am: 224e2daf5b

Change-Id: I190f74604641a988cd8cb6e7067abaaf624eb1df
2017-09-08 04:32:23 +00:00
Sujith Ramakrishnan
224e2daf5b Merge "Make ASSIST launch VIS and add a new keycode for TV (ALL_APPS)" into oc-mr1-dev 2017-09-08 04:25:15 +00:00
Amith Yamasani
a220790855 Merge "Javadoc update for permission requirements" into oc-mr1-dev
am: 2ce2f84999

Change-Id: I6703ab1128202f5928d574c55d0f4a9129c95b60
2017-09-08 02:39:11 +00:00
TreeHugger Robot
2ce2f84999 Merge "Javadoc update for permission requirements" into oc-mr1-dev 2017-09-08 02:26:02 +00:00
Fyodor Kupolov
ac6d9d3173 Merge "Allow using SQLiteGlobal for testing" into oc-mr1-dev
am: 347eaf21fa

Change-Id: I664b887cced9b328227c6ad053463e426c316fd8
2017-09-08 00:26:49 +00:00
Fyodor Kupolov
347eaf21fa Merge "Allow using SQLiteGlobal for testing" into oc-mr1-dev 2017-09-08 00:13:51 +00:00
Amith Yamasani
172dd5c652 Javadoc update for permission requirements
Bluetooth scanning requires holding these permissions for results
to be delivered.

Bug: 65013767
Test: N/A
Change-Id: I0b5fa9efa7fc8d5cff25319fbd7719cedee6a4aa
2017-09-07 23:42:27 +00:00
Sujith Ramakrishnan
f8942c0c88 Make ASSIST launch VIS and add a new keycode for TV (ALL_APPS)
- KEYCODE_ASSIST: Looks for default VIS in system partition
      and launches it.
    - Ensure foreground activity assist context extras are collected
      and sent to VIS.
    - KEYCODE_ALL_APPS: Sends Intent.ACTION_ALL_APPS. For TV,
      this targets default launcher package in system partition.

Test: Manual: ASSIST: adb shell input keyevent 219
Test: Manual: ALL_APPS: adb shell input keyevent 284
Test: also tested with --longpress for these keys
Test: Manual: Checked with dummy app populating overridden
      onProvideAssistData()
Test: Keypresses after overriding ALL_APPS and ASSIST
      on Nexus Remote

Bug: 37950079
Bug: 38496261
Change-Id: I96d9de67d4a442a8c6cb7feec28fc9aeb0dcbc18
2017-09-07 16:19:53 -07:00
Felipe Leme
1540bfd21d Fixed CharSequenceTransformation to use find() instead of matches().
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.CharSequenceTransformationTest#testReplaceAllByOne
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 65459117

Change-Id: Ib5ff31b6b12e5583e736a0593e941e1556ae7384
2017-09-07 15:22:22 -07:00
Felipe Leme
1c0d25fc56 Merge "Finishes the session when the service returns a null response on authentication." into oc-mr1-dev
am: a61839458f

Change-Id: Ib8eaa593b6e95b205d0d05cd07eb8fd2669ee957
2017-09-07 21:24:49 +00:00
Felipe Leme
a61839458f Merge "Finishes the session when the service returns a null response on authentication." into oc-mr1-dev 2017-09-07 21:13:18 +00:00
TreeHugger Robot
b913a1e618 Merge "Bluetooth: Thread-safe binder invocation" into oc-mr1-dev 2017-09-07 17:38:59 +00:00
Felipe Leme
8fa5f5e7df Added more logging to diagnose a racy runtime restart.
Also fixed a possible NPE on saveLocked() and improved locking.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug: 65374274

Merged-Id: I4b8368a9d19b4b4da76533dadb013ff2e2922955
Change-Id: I4b8368a9d19b4b4da76533dadb013ff2e2922955
2017-09-07 09:31:30 -07:00
Daniel Nishi
a5288e7ae6 Merge "Flag storage settings cache invalidation time." into oc-mr1-dev
am: b53b925f68

Change-Id: Ib6706048900ee19a72ad412da091a9278adb42c5
2017-09-07 15:15:04 +00:00
Rubin Xu
3721305094 Always add local subnet routes to the interface's routing table
For some networks such as mobile data connections, its LinkProperties
does not contain routes for the local subnet so no such route is added
to the interface's routing table. This can be problematic especially
if the device is in VPN lockdown mode where there exists high-priority
PROHIBIT routing rule which in turn blocks the network's default gateway
route from being added (next hop address hitting the prohibit rule).

We fix this by patching LinkProperties to always include direct connected routes
when they are received by ConnectivityService. This has the added advantage that
when apps get LinkProperties, they see the directly connected routes as well.

Bug: 63662962
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: Start with device with mobile data, set up ics-OpenVPN in always-on
      lockdown mode. Turn off mobile data then turn it back on, observe
      mobile data connectivity is restored and VPN successfully reconnects.

(cherry picked from commit 1bb5c0818f)

Change-Id: Ia14f88bcf49d37286519c26dff6b7180303e2cbe
2017-09-07 14:17:57 +01:00