Commit Graph

304339 Commits

Author SHA1 Message Date
Erik Kline
eaa7180686 Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2 am: 555812a3e2 am: 65e01ec4ed
am: 0b4b94b085

Change-Id: I25d009155441f1f3c58f03a11d9b93808d62d963
2017-01-24 18:52:06 +00:00
Hugo Benichi
593471a045 DO NOT MERGE frameworks-test: adding missing @SmallTest
am: 141923e5b6  -s ours

Change-Id: I8499fb3133f75170de4cfb177ab538d155ccc738
2017-01-24 18:50:34 +00:00
Chen Xu
f32778c633 Merge "support suw and post-suw cases for default app" am: 9fc8d99c76 am: ea55399ecc am: f2a5e432b0
am: 5ef316e34d

Change-Id: Ib32941ab4965e1554e8e7bdd228fa59f860451a1
2017-01-24 18:49:06 +00:00
Sanket Agarwal
46eccf5a71 Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp
am: 9ac9632ed3

Change-Id: I544e52352fd8d66c8f2028ad610f13aa9d6d6ba6
2017-01-24 18:46:11 +00:00
Sanket Agarwal
d2f8ccb8a2 Change HFP Client API to support multi device am: c8399321e9
am: 3978435d5a

Change-Id: Ib9b59a18cb9633caa63c5ac723e9e12c1138f513
2017-01-24 18:45:43 +00:00
Ta-wei Yen
70021579f7 Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev am: 70f920fa0c
am: 5c2aa05bfb

Change-Id: I583722ca6ac52499d027f6660393647e6051a4c5
2017-01-24 18:43:58 +00:00
Ta-wei Yen
ea0a8bddec Fix typo in the IS_OMPT_VOICEMAIL field. am: 57365441d4
am: e696c3d911

Change-Id: I380e1a15f1c13009b876dd0347ef811cd3f70aed
2017-01-24 18:42:46 +00:00
Jeremy Joslin
5c5747e541 Merge "Mark the INetworkScoreCache as oneway." am: edadb3efc3 am: 4fcc44dc9a am: ea65f9d392
am: 577aac1385

Change-Id: I9044cfa8445014d08bc416e46811c57e5972d653
2017-01-24 18:41:47 +00:00
Nancy Zheng
5299311602 Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be
am: 60e03c36b7

Change-Id: I5790f4748bf2b3f09b4d2efb66ecba117d289844
2017-01-24 18:40:42 +00:00
Nancy Zheng
678546838d Query for the settings package in KeyguardManager instead of hardcoding it. am: e256a18dcd am: 11bdbd1145
am: 52b8412742

Change-Id: I050903bafefed0d80961901ac98d67f7cc22dfaa
2017-01-24 18:39:42 +00:00
Nancy Zheng
3cf5963288 Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: d0c5f0047f
am: 7a86073718

Change-Id: I9c1cc2e674be02d9440024c3b64432cf0c3d371d
2017-01-24 18:38:41 +00:00
TreeHugger Robot
2bf3b1b2cf Merge "Fixing error calculating the top pinned activity." 2017-01-24 18:20:13 +00:00
Jason Monk
5559543e81 Merge "Add long-click to app info for plugin settings" 2017-01-24 17:49:46 +00:00
Andrew Sapperstein
4c2fe5da49 Merge "Add Settings.Global configs to high temp warning." 2017-01-24 17:34:31 +00:00
Jorim Jaggi
d285d67f3a Merge changes I5df77ae5,Ice538d09,I2451be87,I953ab6cb,Ie1b8debc
* changes:
  If the surface of a window is displayed, screenshot
  Update starting window fade out to spec
  Fill task snapshot with background color
  Add starting windows while unlocking
  Starting window tests, yay!
2017-01-24 17:32:32 +00:00
TreeHugger Robot
e5ec708000 Merge "Fix crash on user switch" 2017-01-24 17:23:07 +00:00
Niels Egberts
f549a5c3f5 Merge "Implement time markers for TTS." 2017-01-24 17:19:34 +00:00
TreeHugger Robot
f779f91cd2 Merge "Implement TextClassification-related methods." 2017-01-24 16:54:57 +00:00
Pankaj Kanwar
dd656b91cc Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." 2017-01-24 16:47:05 +00:00
Yohei Yukawa
7383ce62ee Merge "Fix ImeSubtypeListItem#compareTo()" 2017-01-24 16:37:09 +00:00
Alexander Hills
3c290d43b1 Merge "Changes the default value of Notification.Action.mAllowGeneratedReplies" 2017-01-24 16:31:42 +00:00
Jason Monk
b68d6ae5a2 Fix crash on user switch
Don't re-register a user switcher while getting a user switched
callback, because that will cause a crash.

Test: switch users.
Fixes: 34661001
Change-Id: I31453d75aabe6ecd657e7500cf1823890d5262a0
2017-01-24 10:56:47 -05:00
Alex Hills
1f27f88f02 Changes the default value of Notification.Action.mAllowGeneratedReplies
Changes the default from false to true

Bug:31934635
Fixes:31934635
Test: CTS tests in ag/1824710
Change-Id: I1c7097627e77eed12bb9cc644c1cbb5c3197a750
2017-01-24 15:38:56 +00:00
Mahaver Chopra
470ecb2c6c Merge "Provisioning terms screen constants" 2017-01-24 15:33:57 +00:00
Niels Egberts
65c5078456 Implement time markers for TTS.
The service can inform the framework at which frame a part of the input
is spoken, and that information is then relayed to the client.

This can be used to highlight the currently spoken word/sentence or to
resume synthesis requests at the start of the last word/sentence.

Test: manual
Change-Id: Ie20a6764a8788cc3539cb058425e55eb6fde07db
2017-01-24 15:27:16 +00:00
Jorim Jaggi
52e85da8fa If the surface of a window is displayed, screenshot
We really really don't care about whether it's actually visible,
onScreen, displayed, winVisible, visibleNow, readyForDisplay or
whatever. The only thing that matters when screenshotting is the
fact whether the surface is shown or not. If it's shown, it must
be good enough for screenshotting. Period.

Test: Go to settings, go to recents, make sure screenshot is taken
all the time.
Bug: 31339431
Change-Id: I5df77ae537b5e70f6cb17e5e18405926135d4312
2017-01-24 16:25:40 +01:00
Jorim Jaggi
d51febd995 Update starting window fade out to spec
Test: Open app, make sure starting window disappears nicely
Bug: 31339431
Change-Id: Ice538d0937f17ed6901ab56ef208f9a327250d51
2017-01-24 16:20:45 +01:00
Jorim Jaggi
829b9cd100 Fill task snapshot with background color
Make sure to fill the portions that are not covered by the
snapshot are filled with the task background color.

Also fix an issue where the starting window was removed across
configuration changes.

Test: runtest frameworks-services -c
com.android.server.wm.TaskSnapshotSurfaceTest
Bug: 31339431
Change-Id: I2451be87aff79b337015ab4bba72cfa03c0d3582
2017-01-24 16:19:31 +01:00
Julia Reynolds
c4d3a70b97 Merge "Add updatable fields to Ranking" 2017-01-24 15:15:28 +00:00
TreeHugger Robot
425a129f1b Merge "add "splitName" attribute" 2017-01-24 15:13:51 +00:00
Abodunrinwa Toki
43e0350922 Implement TextClassification-related methods.
Implements TextClassificationManager.detectLanguages
 Implements TextClassifier interface

Bug: 34661057
Test: See: Ic2a5eceeaec4cd2943c6c753084df46d30511fee
Change-Id: Ic640b96f48bcad7cdd8c4dfac354b008a7ae3961
2017-01-24 15:13:04 +00:00
TreeHugger Robot
110dad7c78 Merge "[SettingsProvider] Auto disable ringtone sync" 2017-01-24 15:05:26 +00:00
Abodunrinwa Toki
1f50fa6df5 Merge "Update TextAssistant interface." 2017-01-24 15:04:29 +00:00
Abodunrinwa Toki
f001fefff3 Update TextAssistant interface.
Rename to TextClassifier
Move to android.view.textclassifier package
Adds getTextClassifierInfo(...)
Changes addLinks(...) to getLinks(...)

This CL also integrates this interface with framework components
and passes a context to TextClassificationManager.

Test: Tests will be added with implementation.
Bug: 34661057
Change-Id: If9e90f034ebb702c1f78e72b6a844f39eebf738f
2017-01-24 15:01:24 +00:00
Alison Cichowlas
3812446093 Merge "Tron - Omit overlong lines and warn when doing so." 2017-01-24 14:39:30 +00:00
Julia Reynolds
924eed1ca6 Add updatable fields to Ranking
- NotificationChannel
- Badging

Test: runtest systemuinotification & cts

Change-Id: I7fd1f2dc06148927e9a4bd5b760d436e2c5e8a98
2017-01-24 08:43:38 -05:00
Jorim Jaggi
8b702edea1 Add starting windows while unlocking
- Modify screen capturing logic a bit such that it can also take a
  screenshot when the display is off.
- Also take snapshot when app visibility is changing without
  proper app transition.
- When unlocking, add strating windows for all visible apps.

Test: Unlock phone.
Test: Have an app that sleeps in onStart, make sure unlocking is
instant.
Bug: 31339431
Change-Id: I953ab6cb30d0d264554fd49a46bdc56e23356d13
2017-01-24 14:13:13 +01:00
Jorim Jaggi
9bafc7150e Starting window tests, yay!
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowContainerControllerTests
Fixes: 34364463
Fixes: 34361417
Change-Id: Ie1b8debc894e5cad8fe517912a1991a38661dfaa
2017-01-24 14:12:42 +01:00
TreeHugger Robot
2cff9319e8 Merge "Merge commit '12562abcd47de4aee3b0469cb04bf771c2072113' into manual_merge_12562abcd47d" 2017-01-24 11:35:18 +00:00
Andre Lago
7bdc6d80ef [SettingsProvider] Auto disable ringtone sync
Disable the SYNC_PARENT_SOUNDS setting if a work profile ringtone is set

Test: cts-tradefed --test com.android.cts.devicepolicy.ManagedProfileTest
Bug: 30658854
Change-Id: I172f5396b47f03ac8afa365db0ec90f3a2dd0e29
2017-01-24 11:12:02 +00:00
Yohei Yukawa
410cc501b2 Fix ImeSubtypeListItem#compareTo()
It turns out that ImeSubtypeListItem#compareTo() does not satisfy the
contract of Comparable#compareTo(), which can trigger
IllegalArgumentException from Collections.sort() depending on the
runtime condition.

This CL makes it clear that two instances of ImeSubtypeListItem will be
compared with with those fileds in the following order.

  1. ImeSubtypeListItem#mImeName
  2. ImeSubtypeListItem#mSubtypeName
  3. ImeSubtypeListItem#mIsSystemLocale
  4. ImeSubtypeListItem#mIsSystemLanguage

Bug: 34255739
Test: adb shell am instrument -w -e class com.android.internal.inputmethod.InputMethodSubtypeSwitchingControllerTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I47f902cc8f5873926d238c30e462d08d7dbebcf7
2017-01-24 00:29:07 -08:00
Erik Kline
0b4b94b085 Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2 am: 555812a3e2
am: 65e01ec4ed

Change-Id: Idfe2c34bad70e0044d7281ba9b9aaaf26f7e2fb5
2017-01-24 08:11:51 +00:00
Erik Kline
65e01ec4ed Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2
am: 555812a3e2

Change-Id: Icac0e50bae970e7aaa9eecc3d7be3c19b2111a78
2017-01-24 08:05:25 +00:00
Erik Kline
555812a3e2 Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am: c1987487a2

Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8
2017-01-24 08:00:48 +00:00
Treehugger Robot
c1987487a2 Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" 2017-01-24 07:54:21 +00:00
Hugo Benichi
141923e5b6 DO NOT MERGE frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414

(cherry picked from commit fa8a6f6220)

Change-Id: I84f9aecfbf9ebe07c6fcfec26acb2c2cfaae2d60
2017-01-24 15:42:45 +09:00
TreeHugger Robot
1a29288420 Merge "Add an accidentally removed call to update libs" 2017-01-24 05:58:40 +00:00
TreeHugger Robot
bcde3dce83 Merge "More APIs for cache status and behavior." 2017-01-24 05:32:58 +00:00
Erik Kline
5645af4e2a All upstream mobile connection management is now in UpstreamNetworkMonitor
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ifbd430d5bf2d2191469c9810ad8f073506abde46
2017-01-24 14:11:51 +09:00
TreeHugger Robot
78b09a00a8 Merge "Fix crashloop in CarStatusBar." 2017-01-24 04:04:39 +00:00