Commit Graph

11822 Commits

Author SHA1 Message Date
Bernardo Rufino
4229c3fcbd Canonicalize notification channel sounds for backup
am: 2d7a4a3f67

Change-Id: I47c5aba70bd6713f5cd2432b1141d0772fa1e672
2017-10-11 17:50:06 +00:00
Bernardo Rufino
2d7a4a3f67 Canonicalize notification channel sounds for backup
Canonicalize for backup and canonicalize and uncanonicalize for restore
(see comment).

Test: Set custom notification sound, make backup, remove notification
sound from device (from Ringtones and make sure to update media content
provider), restore => Observe default instead of random number. Do the
same without removing the sound and observe restores successfully.
Test: runtest systemui-notification
Bug: 66444697

(cherry picked from commit c27bb6ad34)

Change-Id: I32c186d0d7479b01f6cc67cce9bc5cb66264a064
2017-10-11 15:22:32 +01:00
Andrew Solovay
81643c09cc Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
am: c4a0b34248

Change-Id: I96c464236f694b194e9f5a6aba68b40ad840035d
2017-10-10 16:42:31 +00:00
Andrew Solovay
ab8ea9ff01 docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.

Test: make ds-docs
Bug: 67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
2017-10-09 18:49:41 -07:00
Ruben Brunk
3de064f7cc Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am: c765c2c448

Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
2017-10-05 04:03:03 +00:00
TreeHugger Robot
c765c2c448 Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev 2017-10-05 03:53:44 +00:00
Felipe Leme
63b45a87d5 Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
am: 6d17d9d0cf

Change-Id: I4b1d2a4e308a91d15282ae99ee158b7004b91211
2017-10-04 22:25:18 +00:00
TreeHugger Robot
6d17d9d0cf Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev 2017-10-04 22:17:11 +00:00
Felipe Leme
bb567ae6c0 Sets AutofillClient on attachBaseContext()
When an activity overrides attachBaseContext(), the attached context must share
the same AutofillCient, otherwise it will break autofill in the activity.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.AttachedContextActivityTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 67350639

Change-Id: I6b0c4c2fab5fa68eb6ee0714e107ca0816efb2cb
2017-10-04 12:23:23 -07:00
Clara Bayarri
889c0c0f12 Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
2017-10-04 12:51:59 +00:00
TreeHugger Robot
348b13f597 Merge "Fix NPE in ActivityThread" into oc-mr1-dev 2017-10-04 12:40:39 +00:00
Ruben Brunk
52ea662280 Bind VR compositor service from VrManagerService.
- Allow VR system application to have VR manager service bind a
compositor process so that oom scoring for the compositor process can be
adjusted.

Bug: 38390640

Test: Check that the VrCore compositor process is -700 on AIO devices with:

  adb shell procrank -o

Change-Id: I7b5bce5eb87bd5ed0fdeadf4ec7bdd2b361ab875
2017-10-03 20:58:30 -07:00
Felipe Leme
aee3ccb15c Merge "Fixed URL used on sample." into oc-mr1-dev
am: 6ba7019bb0

Change-Id: I124cbaecd5f8763ecd7f4b06070af48f6b1e0c1d
2017-10-04 00:36:02 +00:00
Felipe Leme
52c6ed3763 Fixed URL used on sample.
Test: nope!
Bug: 66963249

Change-Id: Ieb46c00d97c8657a4e7498a8136c6da46760fbdd
2017-10-03 14:49:15 -07:00
Clara Bayarri
cb941157a2 Fix NPE in ActivityThread
Calling LoadedApk.getResources() instead of accessing its
mResources directly accounts for the case where this might
not have been initialized.

Bug: 67327250
Test: none
Change-Id: Iaa392a90eefb60ad479cedf8c882976dbe390387
2017-10-03 16:03:22 +00:00
George Mount
8e8e3eff08 Merge "Fix Transition test failure." into oc-mr1-dev
am: dbd11d6c8b

Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5
2017-10-02 21:23:15 +00:00
George Mount
3884b03b98 Fix Transition test failure.
Bug: 67049319

TransitionUtils was returning null when the View wasn't attached,
but Visibility transitions can do that intentionally. This CL
temporarily adds detached views to the view hierarchy as part of
an overlay while creating the hardware bitmap representation.

Test: ran transition CTS tests
Change-Id: Ie335619953653dce0224514f0d5c9c8eb00ee1a9
2017-09-29 15:03:47 -07:00
Felipe Leme
8eec0c723d Merge "Fixed warning on getWebDomain()" into oc-mr1-dev
am: 256c2822f5

Change-Id: I4279400bd5a5ab441961942782054d5e810235c4
2017-09-29 18:40:34 +00:00
Felipe Leme
6221903454 Fixed warning on getWebDomain()
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML.
Bug: 66963249

Change-Id: If063961f41f297da1ed67e73616972f455edc117
2017-09-29 08:58:47 -07:00
Svet Ganov
b5ac756015 Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev
am: 4de7ab5cb1

Change-Id: I2e50c036193ba30a203fcfe2f46ea9f94b5992ee
2017-09-29 00:17:57 +00:00
TreeHugger Robot
4de7ab5cb1 Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev 2017-09-28 22:22:56 +00:00
Doris Liu
732b3c4159 Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev
am: a3acf73c3e

Change-Id: I1aa48a41fbbf453f9a3d0ce794f81103a5ed1e35
2017-09-28 02:48:26 +00:00
Doris Liu
a3acf73c3e Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev 2017-09-28 02:33:48 +00:00
Doris Liu
d4c5ab8b8c Associate RenderNodes created for hw bitmap w/ views
In transition animations, in order to capture the content of a view
or a drawable in a hw bitmap, a RenderNode needs to be created. The
RenderNode was previously setup with no owning view. As a result,
in cases where RenderNode animations are triggered by the draw calls
in displaylist recording, these animations would fail for lack of a
view to animate on.

This CL ensures that when RenderNodes are created for the purpose of
populating content in a hw bitmap in transitions, there's always a
view associated with each RenderNode.

BUG: 65160121
Test: Force to repro crash by changing press state during hw bitmap
creation, which triggers a ripple animation that led to the
otherwise timing dependent and hard to repro crash.

Change-Id: I2b4ba95cad25a94d50b3904e775606f737e960e3
2017-09-27 16:53:05 -07:00
Svet Ganov
6ce92394ad Don't clobber shared libs when updating app info
If we update a package without restart or if an installed
package is a target of a resource overlay we update the app
info on the applicaiton side which is then used to update
the class loader and the resources the app is loading from.
To do that we send over an app info instance for the package
which was partially populated and missing the shared lib
entries resulting in apps not finding resources and classes
from the lib.

Test: manual

bug:62685545

Change-Id: Ib40b430c85a1e5d74f270a4326497ea3bd832215
2017-09-27 16:04:14 -07:00
Adrian Roos
392a9b5c1d Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
am: 73c93f02f7

Change-Id: I647bfc52892b305eb59f446812e142b609172bd4
2017-09-25 18:38:23 +00:00
Adrian Roos
73c93f02f7 Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev 2017-09-25 18:33:01 +00:00
Adrian Roos
2adc263ce9 FRP: Add config flag for disabling credential FRP
Bug: 65258606
Test: Verify FRP still works when not disabled
Change-Id: I78e308b6eaba73c794615b1eebdbfacb334ae72f
2017-09-25 13:32:48 +02:00
Neil Fuller
ba0f43de1f Merge "Move non-public intent out of the public namespace" into oc-mr1-dev
am: 3f1ba67f1e

Change-Id: Ie93db5b1770cc05ba476b97b829a8f8e1925f673
2017-09-22 10:31:43 +00:00
TreeHugger Robot
3f1ba67f1e Merge "Move non-public intent out of the public namespace" into oc-mr1-dev 2017-09-22 10:24:43 +00:00
Winson Chung
58c6e603b2 Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
am: 66f2d56556

Change-Id: I9145bce7131e695a696e50b3e46e5c4a30a8e669
2017-09-21 16:46:20 +00:00
Winson Chung
66f2d56556 Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev 2017-09-21 16:38:16 +00:00
Neil Fuller
f24394f1dc Move non-public intent out of the public namespace
Move a non-public intent out of the public android.intent.action
namespace. The new name is
com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK.

Bug: 65991376
Test: CTS: run -m CtsIntentSignatureTestCases
Test: PTS: run -m PtsTimeZoneTestCases
Change-Id: I619b564aa6262108ab2d1c95ba6e288efd8cc9f2
2017-09-21 12:56:19 +00:00
Selim Cinek
98507bebf0 Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
am: 204346c277

Change-Id: I0723bc15fb651881ee9c42fd59c2a94abc761c42
2017-09-21 01:38:09 +00:00
TreeHugger Robot
204346c277 Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev 2017-09-21 01:29:53 +00:00
Selim Cinek
a6ee4bd1bc Revert "Increased the text size for colorized notifications"
This reverts commit 299b3302ef.

Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84
Bug: 35925915
Fixes: 66067974
2017-09-20 23:03:12 +00:00
David Stevens
85cac19a66 Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
2017-09-20 00:18:26 +00:00
David Stevens
9282193c84 Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev 2017-09-20 00:09:04 +00:00
Winson Chung
85d3c8a8f8 Ensure profile-specific PiP notification is shown.
- Pipe through user id when an activity is pinned, to ensure we show the
  right notification with the correct profile badge that launches into the
  correct profile's PiP settings.

Bug: 65417722
Test: Enter PiP for work profile app, ensure that it shows the notification
      for that profile, and launches the profile-specific PiP settings.

Change-Id: I62b8e1b23cb81bfc60c93f452cf950ab06cbf32d
2017-09-19 14:06:01 -07:00
David Stevens
67c036b1ba Handle showWhenLocked on secondary displays
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.

Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug: 64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
2017-09-19 18:15:43 +00:00
Santos Cordon
a17abfef56 Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
am: f7771c9f77

Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9
2017-09-19 00:47:52 +00:00
Santos Cordon
01a4ea59f3 Fix missing RequiredPermission annotation.
Bug: 64360244
Test: Manual compilation.
Change-Id: I7091e366baf5bcaf29945e9a0e2a283309e54452
2017-09-18 18:39:55 +00:00
Selim Cinek
f83e81117a Merge "Increased the text size for colorized notifications" into oc-mr1-dev
am: dd3b6c83c6

Change-Id: Ifd1e83f3400bd870d087c1a248bb74b305aa313f
2017-09-15 21:26:46 +00:00
Selim Cinek
dd3b6c83c6 Merge "Increased the text size for colorized notifications" into oc-mr1-dev 2017-09-15 21:20:44 +00:00
Selim Cinek
299b3302ef Increased the text size for colorized notifications
Increased the text sizes a bit to make them more prominent.

Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes: 	35925915
2017-09-15 11:08:30 -07:00
Jiyong Park
8aefdab7c3 Merge "Fix missing null checking" into oc-mr1-dev
am: 93d436f4bc

Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea
2017-09-15 02:47:46 +00:00
Kevin Hufnagle
86ca0d2ad4 Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16
am: 677b6f5a7b

Change-Id: Ib225f08dd4d53479adab6df0f3559d09fe09ab21
2017-09-15 02:24:50 +00:00
Jiyong Park
93d436f4bc Merge "Fix missing null checking" into oc-mr1-dev 2017-09-15 02:19:19 +00:00
Kevin Hufnagle
677b6f5a7b Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df
am: 91fb9b2a16

Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
2017-09-15 01:01:15 +00:00
Kevin Hufnagle
91fb9b2a16 Merge "docs: updated link on RemoteInput page" into oc-dev
am: 6087b990df

Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
2017-09-15 00:42:20 +00:00