Commit Graph

80451 Commits

Author SHA1 Message Date
Kang Li
45b7084ea7 Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev am: d967ee3492
am: 8853465754

Change-Id: Idd79132833e43bebf75f48b405715657d03cf90d
2017-06-30 19:49:17 +00:00
Kang Li
8853465754 Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev
am: d967ee3492

Change-Id: I9573bc8878123fbad308d27adb2977811814ffcd
2017-06-30 19:41:14 +00:00
TreeHugger Robot
d967ee3492 Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev 2017-06-30 19:28:31 +00:00
TreeHugger Robot
08a18210fb Merge "Remove the internal APIs of TSM to change spell checker settings" 2017-06-30 17:37:27 +00:00
Fyodor Kupolov
db0da015de Merge "Support for lookaside configuration params" 2017-06-30 16:47:35 +00:00
Bryce Lee
a89a8cdef9 Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev am: 392ac74f37
am: 4c201983cf

Change-Id: Ie0a49f094952dbd717dc1a71de4aafd267e9c214
2017-06-30 16:42:10 +00:00
Bryce Lee
bb7965ed90 Merge "Add rotation to configuration." into oc-dr1-dev am: 2050dc66e2
am: 2004fc1387

Change-Id: If3a3975a2e07a96de1120b1a0744eab466284764
2017-06-30 16:40:58 +00:00
Bryce Lee
4c201983cf Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev
am: 392ac74f37

Change-Id: I9105966db42cf5cc9f0748ddd9121806529a3dd3
2017-06-30 16:33:30 +00:00
Bryce Lee
2004fc1387 Merge "Add rotation to configuration." into oc-dr1-dev
am: 2050dc66e2

Change-Id: I585507c98972c7b8a2ad07e21bf56c13552d20a4
2017-06-30 16:32:22 +00:00
Bryce Lee
392ac74f37 Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev 2017-06-30 16:17:34 +00:00
Bryce Lee
2050dc66e2 Merge "Add rotation to configuration." into oc-dr1-dev 2017-06-30 16:17:34 +00:00
Bryce Lee
f858b5788e Always send configuration to client from resize and relayout.
Previously, the server side would omit reporting new configurations
during resize and relayout if the current configuration matched the
last reported. However, if the last reported came through a resize,
the client side handling would be enqueued as a Handler message. This
leads to the possibility of the client getting a new window frame but
not a new configuration where this is synchronously handled, such as
ViewRootImpl::performTraversals.

To address this issue, we now always send the current configuration
from the server to the client. The client then identifies changes
against its own record of last reported configuration and updates as
appropriate.

This changelist also adds a call to force window relayout during
updateConfiguration, as it's possible this is called after
performTraversals is called or resize is handled, leading to a stale
window frame.

Bug: 24671393
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
      temporary logs to detect inconsistencies between measurements
      and reported rotation on draw.

Change-Id: I0d5143dfe80400f6a43ce710750f9fc9d4b93f74
2017-06-30 06:42:50 -07:00
Jack He
266499d9d8 Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
Merged-In: I9f49ea28efdf6de0e751a377d879fe13a47655d5
(cherry picked from commit 679d0bc8f9)
2017-06-30 10:41:18 +00:00
Jack He
fff37da08d Support battery level reporting via Plantronics XEVENT (1/2)
* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
Merged-In: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
(cherry picked from commit 0fcbba25b7)
2017-06-30 08:39:44 +00:00
Jack He
dfd8618b2d HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
  EXTRA_HF_INDICATORS_IND_ID should be int
  EXTRA_HF_INDICATORS_IND_VALUE should be int

Bug: 35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
Merged-In: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
(cherry picked from commit 73795440a5)
2017-06-30 06:22:46 +00:00
TreeHugger Robot
41760687fd Merge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev 2017-06-30 06:21:48 +00:00
Jack He
2b07bbafa2 Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
  information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
  that remote device's battery level has changed

Bug: 35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Merged-In: I41051ee25383f5f3a1e505aef6f8c526385f58bd
(cherry picked from commit 1d312bfa78)
2017-06-30 04:01:36 +00:00
TreeHugger Robot
70f61cf626 Merge changes from topic 'am_start_attach_agent'
* changes:
  Frameworks: Add agent to ProfilerInfo
  Frameworks: Clean up ProfilerInfo
2017-06-30 03:44:44 +00:00
Andreas Gampe
83085bb3dd Frameworks: Add agent to ProfilerInfo
Add an agent option to ProfilerInfo. If set, on bindApplication
attempt to attach the given agent to the app before loading the
app itself.

Bug: 62445317
Test: m
Test: Device boots
Test: Manual profiling tests
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAmProfileTests
Test: Manual agent test
Test: cts-tradefed run commandAndExit cts-dev --module CtsJvmtiAttachingHostTestCases
Change-Id: I1f0c4121e22351fd3a964dd0a915100a620d4f84
2017-06-29 20:42:32 -07:00
Andreas Gampe
2b073a0e89 Frameworks: Clean up ProfilerInfo
Use a ProfilerInfo object in ActivityManagerService to reduce the
number of exposed fields. In preparation for adding an agent during
startup.

Bug: 62445317
Test: m
Test: Device boots
Test: Manual test for profiling
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAmProfileTests
Change-Id: I5fa347ded760c263a8ce3754bb2631205ea7b4b8
2017-06-29 20:42:25 -07:00
Albert Chaulk
c8600632b1 Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev am: 4bf79089c4
am: 1bfecb614e

Change-Id: I17be0a9b64ae628fedcfa61dbddb4cbcaaa58b79
2017-06-30 03:34:13 +00:00
Albert Chaulk
1bfecb614e Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
am: 4bf79089c4

Change-Id: I634f874a94e97aadc139e75d241efa4c9e13542a
2017-06-30 03:27:04 +00:00
TreeHugger Robot
4bf79089c4 Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev 2017-06-30 03:22:45 +00:00
TreeHugger Robot
c32ef9ce66 Merge "Fix memory file constructor" 2017-06-30 02:10:53 +00:00
Phil Weaver
2b94b2ad75 Merge "Revert "Added PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS window flag."" 2017-06-30 02:06:00 +00:00
Phil Weaver
909eda1faf Revert "Added PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS window flag."
I submitted this change by accident after confusing it with one of mine. Sorry.

Bug: 62196835

This reverts commit 6f2a1a18fc.

Change-Id: Ib6d89690d1d761d38da3131131ff807a3fac0d2b
2017-06-30 02:03:32 +00:00
Phil Weaver
d442642c1d Merge "Added PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS window flag." 2017-06-30 01:55:42 +00:00
Ricardo Loo
7af458a415 Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439 am: 824b41d77a
am: a29c9a9466

Change-Id: Id7b3e0f72b60b0450aa9b6aa181faae8a22109e7
2017-06-30 01:06:58 +00:00
Ricardo Loo
a29c9a9466 Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439
am: 824b41d77a

Change-Id: Ie9593ce8239fc8c5f0e8dd40bc513c1edcb849a1
2017-06-30 00:59:20 +00:00
Ricardo Loo
824b41d77a Merge "docs: Updated isAutofillSupported description." into oc-dev
am: a89dfb5439

Change-Id: Ie43f37efa9e268b04dbad09ad04795089de68adf
2017-06-30 00:51:55 +00:00
Chet Haase
54f91d66e8 Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184 am: d73f6a985d
am: 95e6c38eb0

Change-Id: Id397296039d2ca9bd8fe6bf4130a3308296843da
2017-06-30 00:47:56 +00:00
Ricardo Loo
a89dfb5439 Merge "docs: Updated isAutofillSupported description." into oc-dev 2017-06-30 00:44:50 +00:00
Bryce Lee
c1f2f2a9d3 Add rotation to configuration.
Certain activities are dependent on the rotation of the device to
determine layout. In these cases, orientation does not provide enough
details.

This CL adds the field (hidden) to the configuration.

Change-Id: Idb3ba10cb4de8838737c25e92264e6cee224e264
Fixes: 32839232
Test: go/wm-smoke
2017-06-29 17:40:23 -07:00
Chet Haase
95e6c38eb0 Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
am: d73f6a985d

Change-Id: I3e9a5533093efe5ecdcc908432ec476f081548f5
2017-06-30 00:39:52 +00:00
Chet Haase
d73f6a985d Merge "Add docs for new padding/margin attributes." into oc-dev
am: 8cdbd6e184

Change-Id: Iacf5e069e0e6a2b38a1566f36f81ab8de693e634
2017-06-30 00:32:26 +00:00
TreeHugger Robot
8cdbd6e184 Merge "Add docs for new padding/margin attributes." into oc-dev 2017-06-30 00:21:28 +00:00
Christopher Tate
2f4953a9b7 Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev am: 2de66f7be1
am: 0d95a0eefa

Change-Id: I9b5f7e4b60534d42728d54f5dd40320dbc518885
2017-06-29 22:44:38 +00:00
Chavi Weingarten
a46b76fd50 Merge "Added Activity flags to show on lock screen." 2017-06-29 22:41:05 +00:00
Nate Fischer
a3bcb76fb6 Merge "WebView: add APIs for setSafeBrowsingWhiteList" 2017-06-29 22:35:18 +00:00
Christopher Tate
0d95a0eefa Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
2017-06-29 22:34:22 +00:00
TreeHugger Robot
2de66f7be1 Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev 2017-06-29 22:26:34 +00:00
John Reck
707108b4ef Fix memory file constructor
Test: builds
Change-Id: Ib449eac18ca73e5e681190adfbf6b0ab28ee0482
2017-06-29 15:07:12 -07:00
Santos Cordon
266bd0d6ca Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev am: 67143a8cfc
am: 99eac47966

Change-Id: I5fb247a2291ee4fdc96b25e297cb7f7e0ec49d5a
2017-06-29 21:38:42 +00:00
Santos Cordon
99eac47966 Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am: 67143a8cfc

Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b
2017-06-29 21:31:53 +00:00
Santos Cordon
67143a8cfc Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev 2017-06-29 21:21:42 +00:00
Doris Ling
85627aa08a Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev am: 18f3adc03a
am: 33dbb7d0e5

Change-Id: I3c39229e1725029f9822bb8fa8d6d47781f8ebc4
2017-06-29 20:57:13 +00:00
Guliz Tuncay
46a54e8be6 Remove the internal APIs of TSM to change spell checker settings
Previously, TextServicesManager was exposing APIs to system services to
modify spell checker settings. However, Settings application is the only
client of these APIs and there is no need to expose it to all the other
services. Settings app already has the WRITE_SECURE_SETTINGS permission
and can directly update the spell checker settings. Hence, we can remove
these APIs from TSM.

Fixes: 62950392
Test: Manually as follows.
      1. Build and flash an OS image.
      2. Complete the setup wizard (if any).
      3. Make sure AOSP Keyboard (com.android.inputmethod.latin) is installed
      4. Install SampleSpellCheckerService
       4.1 tapas SampleSpellCheckerService
       4.2. make -j
       4.3. adb install -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
      5. Set the current spell checker service to be AOSP SCS by
       adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
      6. Run a test program that has TextView and tap on one of the
       TextViews and type some text.
      7. Observe that there is a connection to AOSP SCS by
       adb shell dumpsys textservices
      8. Set the current spell checker service to be
      SampleSpellCheckerService SCS by
adb shell settings put secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
      9. Observe that there is a connection to SampleSpellCheckerService
      SCS by
       adb shell dumpsys textservices
Change-Id: I4513ca661788f00785f684c21d7244c233b6e33e
2017-06-29 20:56:52 +00:00
Doris Ling
33dbb7d0e5 Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
am: 18f3adc03a

Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719
2017-06-29 20:49:39 +00:00
TreeHugger Robot
18f3adc03a Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev 2017-06-29 20:41:47 +00:00
chaviw
59b9885bc8 Added Activity flags to show on lock screen.
Added two new flags to the Activity to turn the screen on and
show on the lock screen. These can be used instead of the Window flags
LayouParams.FLAG_TURN_SCREEN_ON and LayoutParams.FLAG_SHOW_WHEN_LOCKED
to prevent the double onStart/onResume lifecycle events.

The flags can be set as an attr for the Activity in the AndroidManifest
using android:showWhenLocked="true" and android:turnScreenOn="true".
They can also be set through methods in the Activity class using
setShowWhenLocked(true) and setTurnScreen(true).

Fixes: 36850100
Test: Created sample application, tests/ShowWhenLockedApp, that set the
      flags in the manifest and code. Tested multiple scenarios to
      launch the Activity with the flags set and unset.
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTransitionTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.ActivityManagerActivityVisibilityTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTests

Change-Id: I44f0e313df4531d49c7ac56108b6bf80e41fefc1
2017-06-29 13:33:43 -07:00