Commit Graph

7849 Commits

Author SHA1 Message Date
Todd Kennedy
2b33116477 Merge "Optionally let the instant app into disambig" into oc-dev am: 1f1d60c5a1
am: 74e39de950

Change-Id: I4e48ba4c05d764322ad2e953430b8b02c7c09712
2017-05-03 02:23:03 +00:00
Todd Kennedy
74e39de950 Merge "Optionally let the instant app into disambig" into oc-dev
am: 1f1d60c5a1

Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
2017-05-03 02:12:28 +00:00
Todd Kennedy
72dc2fa6ad Optionally let the instant app into disambig
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.

Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes: 37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
2017-05-02 17:03:36 -07:00
TreeHugger Robot
4b64614e6e Merge "Upstream update" 2017-05-02 22:47:05 +00:00
Lucas Dupin
425d9c5ae6 Upstream update
Pulling changes from support library

Test: non-applicable
Change-Id: Ibacca48ad78a39739793b6400b7fcb19447d26db
2017-05-02 10:33:00 -07:00
Vladislav Kaznacheev
8386225861 Merge "Fix submenu position when showing with Gravity.END" into oc-dev am: 883af0766a
am: 1ae2909045

Change-Id: I178f0af13e2df05acf0918e492a9b8a44d1107e6
2017-05-02 15:58:35 +00:00
Vladislav Kaznacheev
1ae2909045 Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am: 883af0766a

Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
2017-05-02 15:48:11 +00:00
TreeHugger Robot
883af0766a Merge "Fix submenu position when showing with Gravity.END" into oc-dev 2017-05-02 15:40:42 +00:00
TreeHugger Robot
eff8ed36b4 Merge "Add a time-out for connecting to SystemServer, and WebView, zygotes." 2017-05-02 10:00:27 +00:00
Dianne Hackborn
8a40a4ca27 Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev am: f1a4b50739
am: a766f1d1ec

Change-Id: I82c6b62af3d4eddbd4e97c83b2bb7d4a1657c63d
2017-04-30 17:44:10 +00:00
Dianne Hackborn
a766f1d1ec Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev
am: f1a4b50739

Change-Id: I242303b9dc50a8a69525d26a41cec6c09e361d17
2017-04-30 17:34:21 +00:00
Dianne Hackborn
83b40f69be Work on issue #36891897: Need to ensure foreground services can't...
...hide themselves

The activity manager now keeps track of all apps that are running
foreground services and builds a notification showing them to the
user.  We ensure they are shown to the user for at least 30 seconds
(configurable).  If foreground services are executed while the
screen is off, their apps will be shown to the user for at least
30 seconds after the screen turns back on.

While doing this I am also adding a new process state to distinguish
between "important background" stuff that should bypass bg check vs.
ones that don't.  By default, these now no longer bypass bg check,
which is really the expected (and documented) behavior.  There is a
new bind flag to allow them to bypass bg check, which is currently
only used by the IME.

Also add some new job scheduler commands that will be used to
write new tests cases for jobs timing out.

Bug: 36891897

Test: manual

Change-Id: Ied3f7b56444254513fd776f06b88bc0e54704958
2017-04-29 19:41:12 -07:00
Vladislav Kaznacheev
618cfc122d Fix submenu position when showing with Gravity.END
Bug: 37792927
Test: manual
Change-Id: I2a1033cb5b78465188958d8f24128d0fe082587f
2017-04-28 17:03:30 -07:00
Glenn Kasten
20137dc148 USB audio: increase protection of member fields
Replace public by private or package access in field declarations,
and add getters and setters as needed.

Test: compiles OK
Change-Id: Ief3fffb6a21d2e4d05153839f444617ea5e70846
2017-04-28 09:13:14 -07:00
Gustav Sennton
f0c52b5e9c Add a time-out for connecting to SystemServer, and WebView, zygotes.
We wait for both the system server and the WebView zygotes, using
infinite loops.
This CL adds a time-out to both these loops.

Bug: 37654329
Test: Boot device, disable Chrome, enable Chrome, then start a WebView
app.

Change-Id: I74397de3caf2b02ee403195aeb3beb2320a2240d
2017-04-28 15:05:12 +01:00
Selim Cinek
ae1d6ee93f Merge changes from topic 'music_extraction' into oc-dev
am: e44061f9e7

Change-Id: I8c5a58540be4e96aea4c48a8365f512d508ff1c5
2017-04-28 01:20:22 +00:00
Selim Cinek
e44061f9e7 Merge changes from topic 'music_extraction' into oc-dev
* changes:
  Make music notifications not dimmable
  Implementing gradual image fade for the media template
  Extracting the notification colors based on the album art
  Moved notification builder creation to the background
2017-04-28 00:24:55 +00:00
Sudheer Shanka
b7d0d538fa Merge "Update VIMS internal state when a packge is modified." into oc-dev am: 8dd177c4e8
am: 28d8e89578

Change-Id: I33e657f6383a6350040af54e1852344e2f107220
2017-04-27 22:57:31 +00:00
Sudheer Shanka
28d8e89578 Merge "Update VIMS internal state when a packge is modified." into oc-dev
am: 8dd177c4e8

Change-Id: Ibf0daf62f79608cf6616226762d959f0aac20d3b
2017-04-27 22:25:14 +00:00
Selim Cinek
0847acd4d4 Implementing gradual image fade for the media template
Test: play music
Merged-In: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes: 36561228
2017-04-27 22:21:50 +00:00
Selim Cinek
5fb73f8629 Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.

Test: manual, play different songs
Bug: 36561228
Merged-In: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
2017-04-27 22:21:17 +00:00
Sudheer Shanka
8dd177c4e8 Merge "Update VIMS internal state when a packge is modified." into oc-dev 2017-04-27 20:31:09 +00:00
Selim Cinek
bea598beae Implementing gradual image fade for the media template
Test: play music
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes: 36561228
2017-04-27 12:38:17 -07:00
Selim Cinek
fb49ffc96a Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.

Test: manual, play different songs
Bug: 36561228
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
2017-04-27 12:37:34 -07:00
Glenn Kasten
04e57d29ff Merge "Add default: to switch statements" 2017-04-27 16:31:16 +00:00
Sudheer Shanka
7a3d901453 Update VIMS internal state when a packge is modified.
When the package that contains the current voice interaction service component
is changed, internal state of VoiceInteractionManagerService needs to
modified to correctly reflect that.

Bug: 36649034
Test: manual
Change-Id: I7e21ac25785b035711affd87f1b04efa717b13c4
2017-04-25 12:57:38 -07:00
Eugene Susla
3aa1f6503e Merge "Check for uses-feature in Companion APIs" into oc-dev am: 7575fa7600
am: 0f88845e56

Change-Id: Ib5272433ce9af4356eb57c50235b488e3f2e2d5a
2017-04-25 06:52:53 +00:00
Eugene Susla
0f88845e56 Merge "Check for uses-feature in Companion APIs" into oc-dev
am: 7575fa7600

Change-Id: I99ca8f54d480a8a297a8e82d7c0883a628541b89
2017-04-25 06:46:24 +00:00
TreeHugger Robot
7575fa7600 Merge "Check for uses-feature in Companion APIs" into oc-dev 2017-04-25 06:42:06 +00:00
Kang Li
1a297e53dc Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
am: 925d3cf211

Change-Id: I9174e1f12c78ff4f7bbd72446fbf10e09478dbe0
2017-04-24 21:31:25 +00:00
Kang Li
925d3cf211 Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev 2017-04-24 21:21:42 +00:00
Hugo Benichi
204cdaa5c5 Merge "Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b am: a80bb82b4e" into oc-dev-plus-aosp
am: 79ffb5a284

Change-Id: I9674c965169fd9dfd0412c80d9362f891bdeb59d
2017-04-24 21:09:19 +00:00
Hugo Benichi
7a0191b355 Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b
am: a80bb82b4e

Change-Id: I5f13b006b57cc8a3ab0560626077d003ce4fe8c8
2017-04-24 19:07:37 +00:00
Eugene Susla
aa43a4ba9f Check for uses-feature in Companion APIs
Fixes: 37629514
Test: Invoke API from app without uses-feature
Ensure an exception with an appropriate message is thrown
Invoke API from app with uses-feature
Ensure no exception

Change-Id: I53665732264ea2de2b4c8c251b1f00bf3a256dad
2017-04-24 11:17:06 -07:00
Hugo Benichi
495a17b332 Move byte logics from ApfFilter into BitsUtil
This patch extracts into BitUtils byte manipulation helper methods
and unsigned type manipulation helper methods from ApfFilter into
an independent and reusable structure.

Test: $ runtest frameworks-net
Change-Id: I0f33af10457a63dbde5983f14353a79b8cd877d9
2017-04-22 10:07:03 +09:00
Hugo Benichi
9910dbc682 Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)
This patch is a partial cherry-pick from commit
df456e13a1 for the BitUtils and
NetworkCapabilities classes.

Bug: 34901696
Test: none

(cherry picked from commit df456e13a1)

Merged-In: Id04f9080e7f75608deeb49306aec34941e71794c
Change-Id: I64eae49f646365b7cd1683a689315fe03bf0bdd9
2017-04-22 09:58:42 +09:00
Matthew Ng
fe9e606112 Merge "Increases the minimized width in landscape by statusbar height" into oc-dev am: e00febf61c
am: 90734c3d7d

Change-Id: I831832fd22168ff443dca0b49f74e687107478ec
2017-04-21 20:47:19 +00:00
Matthew Ng
90734c3d7d Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
am: e00febf61c

Change-Id: Icb24d1e3e2845544936268fbbb5d27b48681506d
2017-04-21 20:39:21 +00:00
TreeHugger Robot
e00febf61c Merge "Increases the minimized width in landscape by statusbar height" into oc-dev 2017-04-21 20:30:51 +00:00
Kang Li
0f80719a6f Moved LRResolverRankerService to ExtServices, and added a permission to
ensure that ResolverRankerServices are from trust sources.

Test: manually shared images in Camera, and in PTP to confirm it works
as expected.

Change-Id: I3549292d424fec949e9115faea7a0c5bdec06e87
(cherry picked from commit 61cf4d145e)
2017-04-21 19:56:59 +00:00
Kang Li
ee8187688e Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." 2017-04-21 19:53:35 +00:00
Kang Li
61cf4d145e Moved LRResolverRankerService to ExtServices, and added a permission to
ensure that ResolverRankerServices are from trust sources.

Test: manually shared images in Camera, and in PTP to confirm it works
as expected.

Change-Id: I3549292d424fec949e9115faea7a0c5bdec06e87
2017-04-21 15:44:51 +00:00
Jocelyn Dang
cc63daaf55 Merge "Add min and max learned battery capacity to batterystats." into oc-dev am: b2aa0ceb0d
am: f29eb24c4e

Change-Id: I8f86cadf46b4cb9dc3dc87c1137f3b876108fca3
2017-04-20 16:08:48 +00:00
Garfield Tan
7c3656dfa2 Merge "Add a null check for visibleFile." into oc-dev am: 1fb3e56998
am: 8a9a686c9f

Change-Id: I7ed34f0644cd219e5a1f295c91f3b81605526b15
2017-04-20 15:01:26 +00:00
Selim Cinek
00511d3dfb Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev am: 947be6bed9
am: c40344bf86

Change-Id: I849b78ceb45e22ab1b63bf4fbb88aac40625fd22
2017-04-20 14:57:42 +00:00
Jocelyn Dang
f29eb24c4e Merge "Add min and max learned battery capacity to batterystats." into oc-dev
am: b2aa0ceb0d

Change-Id: I9822b8540decfef15473f05ef08563699aa0d20e
2017-04-20 04:40:10 +00:00
Jocelyn Dang
b2aa0ceb0d Merge "Add min and max learned battery capacity to batterystats." into oc-dev 2017-04-20 04:34:14 +00:00
Eugene Susla
8ab86a6dc6 Add BitUtils (from "Support multiple filters per association request")
This patch is a cherry-pick of the BitUtils class from commit
36e866b8e0.

(cherry picked from commit 36e866b8e0)

Test: none
Change-Id: Iaf33929f6841db273a92d650e84287bf2964fa3d
Merged-In: I0a978787551a1ee5750ec5544b241d3bbfed5a7c
2017-04-20 12:16:48 +09:00
Garfield Tan
8a9a686c9f Merge "Add a null check for visibleFile." into oc-dev
am: 1fb3e56998

Change-Id: I7b6faf56a23a120707b9a611fe5bceb8cff5aef1
2017-04-20 01:06:59 +00:00
TreeHugger Robot
1fb3e56998 Merge "Add a null check for visibleFile." into oc-dev 2017-04-20 01:01:07 +00:00