Commit Graph

11797 Commits

Author SHA1 Message Date
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
Jiyong Park
63495c2796 Fix missing null checking
Bug: 65666724
Test: build

Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
2017-09-15 08:07:41 +09:00
Lucas Dupin
c86252c1dc Merge "Show big text on AoD" into oc-mr1-dev
am: a4996f241f

Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7
2017-09-14 22:32:57 +00:00
TreeHugger Robot
a4996f241f Merge "Show big text on AoD" into oc-mr1-dev 2017-09-14 22:19:41 +00:00
Lucas Dupin
06c5e642aa Show big text on AoD
Test: Receive notification, look at AoD
Change-Id: I4ccb33895b5acf12a6341c22c853b0cf75036497
Fixes: 64128466
2017-09-14 10:10:08 -07:00
Jiyong Park
6cc659cd9e Merge "vendor apk is unbundled" into oc-mr1-dev
am: a26750e757

Change-Id: I218a52a0fff924ca139c96c35df5b3ad0c917216
2017-09-14 14:51:57 +00:00
George Mount
42cb4b1d03 Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
am: 465a956066

Change-Id: Ieb8f17d3b1c345f27298dd4e461eaa7b780543b7
2017-09-14 02:19:59 +00:00
TreeHugger Robot
a26750e757 Merge "vendor apk is unbundled" into oc-mr1-dev 2017-09-14 01:35:42 +00:00
George Mount
3ceb116d4c Fix problem with empty AnimatorSet during fragment removal.
Bug: 65354043

When an empty AnimatorSet is used in a fragment animation,
it can end immediately. This CL properly detects this
case and handles it properly.

Test: manual, ran fragment CTS
Change-Id: I63bee3818106f9c8e86cdc94af61d6bc8407c789
2017-09-13 13:17:18 -07:00
George Mount
87f68c849f Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev
am: 2f35f15ab0

Change-Id: Ie360f3af438f0c1b58620048258d7ba666363744
2017-09-11 17:40:46 +00:00
TreeHugger Robot
2f35f15ab0 Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev 2017-09-11 17:25:33 +00:00
George Mount
476aeeaba2 Fix showing views after failed transition to translucent window.
Bug: 65268614

When an activity transition was used with the top activity being
translucent, and the top activity calls finish() instead of
finishAfterTransition(), the transitioned views were not being
drawn properly. The source of the problem was that
setTransitionVisibility() was being used instead of setVisibility().
Transitions normally use setTransitionVisibility() to modify
the view's visibility without triggering an invalidation. But
when we want the view to be invalidated by the visibility change,
setTransitionVisibility() prevents the invalidate() from
actually invalidating the view.

Test: manual
Change-Id: I250ea232052d1a1309d3341504cba77543a94eec
2017-09-08 16:01:10 -07:00
Jiyong Park
fcad69682a vendor apk is unbundled
Vendor apks has been regarded as bundled apps and thus provided with all
internal libraries under /system/lib and /vendor/lib. However, in new
devices where Treble is fully enabled, system and vendor partitions are
no longer bundled together; system partition can be updated
independently from the vendor partition.

In that case, the apks in vendor partition are considered as unbundled
so that access to /system/lib is limited.

In addition, when the linker namespace is created for apks, information
on whether the apk is in vendor partition or not is given to the
libnativeloader library. The information is used to conditionally
configure the linker namespace for vendors. For examle, vendor apks are
allowed to access /vendor/lib even though they are considered as
unbundled; because vendor apks and vendor libs are still bundled
together in the same vendor partition.

Bug: 63553457
Test: 1) set target as 2017 pixel
2) m -j CtsVendorJniTestCases
3) copy the built apk into /vendor/app/CtsVendorJniTestCases
4) reboot / factory reset
5) adb shell am instrument -w android.jni.vendor.cts

Change-Id: Iadd34af2878c507d4d6ec50153abef4e65604ac9
2017-09-08 08:32:41 +09:00
Rubin Xu
c17f1d412b Merge "Fix resetPasswordWithToken before user unlock" into oc-mr1-dev
am: 2e21fba2b5

Change-Id: I83688cd83cf18f37b3507ebe69d29dbc2669178b
2017-09-06 12:19:51 +00:00
Rubin Xu
7cf4509c31 Fix resetPasswordWithToken before user unlock
1. Fix system server crash when resetPasswordWithToken is called before use
   unlock, due to DPMS enforces user is unlocked when calculating password
   sufficiency.
2. Propogate new password metric from LockSettingsService to DPMS after a
   password reset with token, and fix a bug where stale quality was used.

Bug: 64923343
Bug: 64928518
Bug: 65286643
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordWithTokenBeforeUnlock
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken
Test: runtest frameworks-services -p com.android.server.locksettings
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest
Test: runtest frameworks-core -c android.app.admin.PasswordMetricsTest
Test: runtest frameworks-services -c com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: Ibb3736547b3b36da4a8a67af711e08a38427aa56
2017-09-05 14:49:00 +01:00
Andrii Kulian
e68942db8e Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev
am: 9352329ee1

Change-Id: I51c19df8f9ad2832102a126778fbc5927d61f094
2017-09-02 00:31:22 +00:00
TreeHugger Robot
9352329ee1 Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev 2017-09-02 00:16:48 +00:00
Andrii Kulian
d93da5c6e2 Fix NPE in ActivityView on surface destruction
Instance variable mSurface in ActivityView was not updated after surface
destroy/create cycle, which lead to NPE when we were trying to release
it again after second destroy callback.

Bug: 63338670
Test: Create app with activityView, cause activity restart.
Change-Id: I96447ebe77d175050565641ba94b748d2b633d99
2017-09-01 21:31:18 +00:00
Mårten Kongstad
4f4a341402 Merge changes I7218f17a,I96b7340a am: 111c955d1d am: 96e763fe71
am: 38f0f5687f

Change-Id: I8d3c46d10463f4c64f7ef96006c31c1343710f53
2017-08-31 22:03:11 +00:00
Mårten Kongstad
96e763fe71 Merge changes I7218f17a,I96b7340a
am: 111c955d1d

Change-Id: I64cb964b751561e87115976866646b1db3858e14
2017-08-31 21:44:25 +00:00
Mårten Kongstad
7a242216a9 ResourcesManager: correct @NonNull -> @Nullable
To clear all overlay packages, the caller of
ResourcesManager#applyNewResourceDirsLocked will pass in null as the
second argument. Fix typo where the argument's annotation misspelled
@Nullable as @NonNull.

Change-Id: I7218f17ac8f121924e722d3e00d3ebdc4d6f3382
2017-08-31 14:50:10 +02:00
Jeff Sharkey
f31cf45e82 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev 2017-08-30 19:01:18 +00:00
Jeff Sharkey
f4de294297 Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
2017-08-30 10:01:10 -06:00
TreeHugger Robot
a050d6302f Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev 2017-08-29 23:47:50 +00:00
Felipe Leme
c24a56ae06 Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.

That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.

Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes: 64309238
2017-08-28 18:04:15 -07:00
Christopher Tate
11620edf31 Note cross-user permission requirement for relevant wallpaper operations
Documentary change only.

Bug: 62343054
Test: N/A
Change-Id: Ibf6617b2c25306852478089b60a019479f8d2bcd
2017-08-28 14:19:32 -07:00