Commit Graph

15772 Commits

Author SHA1 Message Date
Selim Cinek
71e6bd1433 Merge "Removed the AmbientPulseManager" into qt-r1-dev
am: dd78681345

Change-Id: Icaf3291acaae32e8cc785a4b31516b4357c47042
2019-06-11 18:44:08 -07:00
Selim Cinek
dd78681345 Merge "Removed the AmbientPulseManager" into qt-r1-dev 2019-06-12 01:35:18 +00:00
Selim Cinek
c3fec68900 Removed the AmbientPulseManager
We only want a single pulse manager since notifications
need to dynamically switch from pulsing to heads up
in the future.

Bug: 130327302
Change-Id: I0cbf23a69f33850776df81c4616932409670fe67
2019-06-11 13:58:02 -07:00
Andrew Solovay
9f0dfc8764 Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4fe6
am: be2a68c47e

Change-Id: Idb85389aeffdc0661adc685abb7f164f9f9437ab
2019-06-10 11:53:30 -07:00
Andrew Solovay
be2a68c47e Merge "docs: Fixing broken HTML" into qt-dev
am: b230dd4fe6

Change-Id: I1bd88c7508c580b69078f62a352958106cb9ae13
2019-06-10 11:43:31 -07:00
Andrew Solovay
b230dd4fe6 Merge "docs: Fixing broken HTML" into qt-dev 2019-06-10 18:23:40 +00:00
Eugene Susla
b8342102f0 Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3
am: 3d5b18aab1

Change-Id: Ib1052e2bc4c1f5f175fa5c27bb348c3673ed1051
2019-06-10 09:50:56 -07:00
Eugene Susla
155cb7c247 Merge "Add timeout for setPermissionGrantState" into qt-dev
am: 3baa0b34e3

Change-Id: Ib1a295ed4de405ce8fc30d53a4334ef1ed2005e6
2019-06-10 09:46:53 -07:00
Eugene Susla
3d5b18aab1 Merge "Add timeout for setPermissionGrantState" into qt-dev
am: 3baa0b34e3

Change-Id: I1a342c7f85a75d6a66296455fabad769a133a89b
2019-06-10 09:45:56 -07:00
Andrew Solovay
7ad2170f4e docs: Fixing broken HTML
A couple of broken </code> tags were messing up the formatting
for the entire page (see b/134696600 , http://screen/aThdcpoDvJo.png )

Staged the fixed doc to:

http://go/dac-stage/reference/android/app/Activity

(The live version of this doc has already been fixed -- I fixed
the HTML by hand in cl/251937759 -- but we need to fix the Java
comment, or the file will revert when we publish beta 5.)

Bug: 134696600
Test: make ds-docs (& staged HTML output)
Exempt-From-Owner-Approval: Docs-only fix
Change-Id: I7e6d11ca358d747cdc6d04741d31c7acd85aa080
2019-06-07 14:14:04 -07:00
Eugene Susla
fa5fb1f661 Add timeout for setPermissionGrantState
Fixes: 134380096
Test: presubmit
Change-Id: Ifff243068eea2637cf8f6391b52a4c53bc544615
2019-06-07 12:56:47 -07:00
Al Sutton
348a282c11 Reconcile the backup OWNERS files with the internal repo.
This CL addresses a specific branch where a merge conflict is happening.

Change-Id: I69f6419055be4adc974041d78a1517ded7e5c57b
Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 134730213
2019-06-07 09:50:19 +01:00
Al Sutton
d10e8f29a2 Reconcile the backup OWNERS files with the internal repo.
This CL addresses a specific branch where a merge conflict is happening.

Change-Id: I03d72ecec447304866d96e2f0908acbc2a1796b6
Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 134730213
2019-06-07 09:40:24 +01:00
Adam Bookatz
5429fd5e37 Merge "loadUnbadgedItemIcon doesn't crash from getUserIcon" into qt-dev am: 14a34b9efb
am: aaa16c0734

Change-Id: I33b958f2b0f2fa29a36b4f6436abe8d446222542
2019-06-06 11:14:09 -07:00
Adam Bookatz
aaa16c0734 Merge "loadUnbadgedItemIcon doesn't crash from getUserIcon" into qt-dev
am: 14a34b9efb

Change-Id: I96167fe68786a5269d2178d74c3bb4ffa1afca1c
2019-06-06 11:05:58 -07:00
Adam Bookatz
01b11dea80 Merge "loadUnbadgedItemIcon doesn't crash from getUserIcon" into qt-dev
am: 14a34b9efb

Change-Id: I7794cb02bdbd1b721d9999666471a9960e6c4877
2019-06-06 11:04:55 -07:00
Adam Bookatz
14a34b9efb Merge "loadUnbadgedItemIcon doesn't crash from getUserIcon" into qt-dev 2019-06-06 17:54:24 +00:00
Antoan Angelov
553ac409d5 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: dad55ca4fe
am: 5b92640550

Change-Id: I6690506fb20f936dc8dfecc4a472b068fae1dd6a
2019-06-05 07:35:16 -07:00
Antoan Angelov
5b92640550 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: dad55ca4fe

Change-Id: If15fbd686362059e97438769f3010946d6c95261
2019-06-05 07:30:17 -07:00
Antoan Angelov
1670ed2d34 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: dad55ca4fe

Change-Id: Ibf07ccf24361173817836246898088ad9776bc82
2019-06-05 07:30:17 -07:00
Antoan Angelov
dad55ca4fe Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 2019-06-05 14:17:39 +00:00
Bookatz
9313af68c2 loadUnbadgedItemIcon doesn't crash from getUserIcon
AppicationPackageManager.loadUnbadgedItemIcon would call
UserManager.getUserIcon if the icon was supposed to represent
switching to another the parent user (from a work profile).
However, that call requires extra permissions which may not be
available, which would cause a crash. The work profile doesn't
generally have permission to see the parent's icon, so rather
than showing the actual icon, a generic user icon is shown instead.

Bug: 134177607
Test: Manual confirmation: create a work profile and try to share a
picture (from Photos) to the personal profile.

Change-Id: Id79ca50b8e0a26593addbacf1a0ea709a2bc4da2
2019-06-05 03:03:24 +00:00
Mady Mellor
b07f107196 Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90
am: b2bcff6769

Change-Id: I700ebe857de98fc6514e6842ae05c4afb04cf14e
2019-06-04 19:20:48 -07:00
Mady Mellor
b2bcff6769 Merge "Post finishing after transition in onBackPressed" into qt-dev
am: 57854d3b90

Change-Id: I7969cfef79133979c5b738496ec2a7c2360e9f11
2019-06-04 18:34:24 -07:00
Mady Mellor
d562e7511b Merge "Post finishing after transition in onBackPressed" into qt-dev
am: 57854d3b90

Change-Id: I09189aa824b36a1de75a58515e2992b9b33e5e9b
2019-06-04 18:13:51 -07:00
TreeHugger Robot
57854d3b90 Merge "Post finishing after transition in onBackPressed" into qt-dev 2019-06-04 19:11:52 +00:00
Alan Stokes
6c55961af2 Cleanup background activity starts for release. am: 9e2457622a
am: b68ff5ab78

Change-Id: Ie28816eba7490d34b72f188bc907c309bf669287
2019-06-04 07:42:55 -07:00
Alan Stokes
2447bb6e8e Cleanup background activity starts for release.
am: 9e2457622a

Change-Id: I220c6b6f18d28ee011957da97bd5258904d09ddc
2019-06-04 07:37:59 -07:00
Alan Stokes
b68ff5ab78 Cleanup background activity starts for release.
am: 9e2457622a

Change-Id: I9bc0682105251e2d462859560978763032b195c2
2019-06-04 07:37:55 -07:00
Alan Stokes
9e2457622a Cleanup background activity starts for release.
This removes the parts of the feature that were only needed in beta
releases:
- Toast when a start is or would be blocked.
- Configurable whitelist of exempt apps.
- Global setting to disable.

Not to be submitted until after beta 5 is cut.

Bug: 131747138
Test: atest BackgroundActivityLaunchTest
Test: atest RootWindowContainerTests
Test: atest WmTests:ActivityStarterTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Test: atest CtsAppTestCases:.ServiceTest

Change-Id: I3d8b9c72c8fac86b93ac57a8a1988f4133043af8
2019-06-04 14:26:00 +00:00
Tiger Huang
2ca7a2bd55 Merge "Fix a bug about missing onConfigurationChanged" into qt-dev am: a54b943d59
am: 64f447cd7b

Change-Id: I9e774a45368888e75fc2e71e59166b3006af0e6a
2019-06-03 11:30:37 -07:00
Tiger Huang
07fb28b0af Merge "Fix a bug about missing onConfigurationChanged" into qt-dev
am: a54b943d59

Change-Id: Ia2ee444aebae7f6f891fe6cfdff9e09cd840bc3c
2019-06-03 11:24:24 -07:00
Tiger Huang
64f447cd7b Merge "Fix a bug about missing onConfigurationChanged" into qt-dev
am: a54b943d59

Change-Id: I276e822663cde616a21f49332f6f9161ec69a550
2019-06-03 11:23:29 -07:00
TreeHugger Robot
a54b943d59 Merge "Fix a bug about missing onConfigurationChanged" into qt-dev 2019-06-03 18:09:34 +00:00
arangelov
f59d691da2 Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS.
Bug: 134391678
Test: none
Change-Id: I7c88200470163b0ec07f345727cfd85ec4d8b96e
2019-06-03 18:05:51 +01:00
Christopher Tate
fea5cc6981 Merge "Prevent double teardown of service connections" into qt-dev am: ae76af46b2
am: 991bcc3d78

Change-Id: I7048f2a8f862601bafd37d30eab437368a7ddea6
2019-05-31 10:51:34 -07:00
Christopher Tate
f9c9ab4540 Merge "Prevent double teardown of service connections" into qt-dev
am: ae76af46b2

Change-Id: If1c2545572c07a72c930fd63b216b8c26bdf2615
2019-05-31 10:36:00 -07:00
Christopher Tate
991bcc3d78 Merge "Prevent double teardown of service connections" into qt-dev
am: ae76af46b2

Change-Id: I47d3b9eb266f19a9f81ef6c1447fb8f112be89dd
2019-05-31 10:34:46 -07:00
TreeHugger Robot
ae76af46b2 Merge "Prevent double teardown of service connections" into qt-dev 2019-05-31 17:27:34 +00:00
arangelov
4ad99fe5ce Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev am: 26a28f64c5
am: 31bcbb7edc

Change-Id: I9b9bebd253052a5ff1475831fc2b1a900e8c5ade
2019-05-30 09:40:57 -07:00
arangelov
6fd8108679 Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev
am: 26a28f64c5

Change-Id: Idbdde0976e2df6253a22e950837c414d51d92237
2019-05-30 09:24:43 -07:00
arangelov
31bcbb7edc Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev
am: 26a28f64c5

Change-Id: I279f5764f1340f6fd7c2a4a71fe84d0e06f43bd1
2019-05-30 09:23:52 -07:00
TreeHugger Robot
26a28f64c5 Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev 2019-05-30 15:05:26 +00:00
arangelov
3b37af4c3c Remove @VisibleForTesting from DevicePolicyEventLogger getters.
Also make it extendable for mocking and update atoms.proto comments.

Bug: 131833599
Test: compiled
Change-Id: I6a0e8a6175e7e9e46572ea4aa50ce7669a02588b
2019-05-30 14:40:12 +01:00
Christopher Tate
36c998c6b7 Prevent double teardown of service connections
Asynchronicities in activity teardown -> service connection teardown
introduced a race in which the teardown could race with new service
bindings to "the same" service instance, and then wind up attempting to
shut down a new, valid instance inappropriately.  Fixed by making sure
to clear the "what needs to be torn down" bookkeeping as part of the
act of doing that teardown, removing the possibility for stale state.

Fixes: 131029480
Test: manual
Test: atest CtsAppTestCases
Change-Id: I33a63f524d147ff6ec97dd3efb0127dcace8bf3c
2019-05-29 18:46:09 -07:00
Beverly Tai
d259d9e570 Merge "Add disable methods in StatusBarManager" into qt-r1-dev
am: b6518a0b64

Change-Id: I8a7355f6893fb8ec233be423977cf13e8bc02730
2019-05-29 06:42:30 -07:00
Beverly
54fead82f5 Add disable methods in StatusBarManager
Test: manual
Bug: 132844641
Change-Id: Ibee48629c6ddb523cafa45238668cb00553f2d5b
2019-05-28 12:57:27 -04:00
Tiger Huang
968064bed0 Fix a bug about missing onConfigurationChanged
The original logic sends the new configuration to the non-activity
components only if there is any public field changed. However, it
doesn't use the latest configuration to compare to the current one,
which caused ActivityThread dropping some onConfigurationChanged
callbacks.

This CL uses the latest configuration to compare to the current one.

Fix: 132653657
Test: Steps in the bug
Change-Id: I969ef189c36ba1903503d8b7de5641103aed8cf3
2019-05-28 07:29:56 +00:00
Rubin Xu
f958b001b5 Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63eb
am: 8643b456b6

Change-Id: I758f67beaa6950a820b0dc426a217580377df2cb
2019-05-27 13:13:04 -07:00
Rubin Xu
8643b456b6 Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev
am: 6cf5ea63eb

Change-Id: If7518fe10c48f2328af8dce4162eeaf2c7be7995
2019-05-27 13:08:06 -07:00