Commit Graph

64486 Commits

Author SHA1 Message Date
Christopher Wiley
7566520f7b Merge "Add InterfaceConfiguration.isUp()" am: c7ea99a63c am: 281d7490bf
am: 39c3166710

Change-Id: I2937f320ccc3ab521fa5d1683048f96d05defedc
2016-10-17 16:58:50 +00:00
Christopher Wiley
39c3166710 Merge "Add InterfaceConfiguration.isUp()" am: c7ea99a63c
am: 281d7490bf

Change-Id: I79b84bd9cdde064be19c1110b3c3c08900123bdd
2016-10-17 16:45:35 +00:00
Christopher Wiley
281d7490bf Merge "Add InterfaceConfiguration.isUp()"
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
2016-10-17 16:41:52 +00:00
Ben Lin
145b0cad42 Adding an Extra field for Intents so chooser show up even if one app.
By design, ChooserActivity (the activity that shows up when there's an
intent sent that can be handled by multiple apps) always default to not
show if there's only one app available to choose from. This adds the
extra in Intent such that if passed in, the parent activity can choose
to override the behavior and force show the chooser even if there's only
one app. Default is still skipping the chooser.

Bug: 31830662
Change-Id: I17d676e77094cded4af99c7433f511e8c6c58164
(cherry picked from commit 2c5adbdf1942898baa97a3c8a7976fc7c0627902)
2016-10-17 11:32:39 +00:00
TreeHugger Robot
c2e3594b7f Merge "Drawing debug focus on Books/Recommended for you/MORE button" 2016-10-14 23:33:55 +00:00
Andrii Kulian
b97963475a Merge "Make usage of Configuration.EMPTY safe" 2016-10-14 23:27:06 +00:00
Adam Lesinski
5dc0782254 Update DisplayMetrics even on default display am: 4309721843 am: dab7950d80
am: d7ec1ea697

Change-Id: Iad9907c77fb1b7b81073150807d6f18a75a24d6e
2016-10-14 22:49:40 +00:00
Adam Lesinski
d7ec1ea697 Update DisplayMetrics even on default display am: 4309721843
am: dab7950d80

Change-Id: I8bb2c9c303380abd3e1a54af68b8a8f7da3225f7
2016-10-14 22:41:35 +00:00
Adam Lesinski
dab7950d80 Update DisplayMetrics even on default display
am: 4309721843

Change-Id: Ib79935f0b80df42db789d94e0a88ac7a0b0b40d5
2016-10-14 22:34:06 +00:00
Winson Chung
011c85729a Merge "Adding PIP input consumer." 2016-10-14 22:34:03 +00:00
Vadim Tryshev
5e16f77865 Drawing debug focus on Books/Recommended for you/MORE button
1. Taking into account scroll state
2. Drawing focus also for views with edges.

Bug: 32099818
Test: Manually ensure that that button draws focus
Change-Id: I085db4deb1561d8b480e4012018d48bc83a7f81f
2016-10-14 14:36:01 -07:00
Android Build Merger (Role)
874fc9b8c6 Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp am: aa3c463a5b" 2016-10-14 18:41:24 +00:00
Robert Sesek
26008b9219 resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp
am: aa3c463a5b

Change-Id: Ib213dc42ac82d6bf738e727d56794a3cd6b1a35d
2016-10-14 18:40:34 +00:00
Jerry Zhang
92b5dc2929 Merge changes from topic 'usb_bugfixes'
* changes:
  Automatically turn on adb for userdebug and eng builds.
  Fixed handling of usb state during adb changes.
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Remove the kick from config switches in UsbDeviceManager
2016-10-14 18:24:35 +00:00
Winson
412754816d Adding PIP input consumer.
- This CL provides the framework for manipulating the pinned stack using
  an input policy (to be determined later) provided by the SystemUI.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testNonTappablePipActivity

Change-Id: I025c41fff26ed05a35d68e59f10330680ed11ea8
2016-10-14 11:21:48 -07:00
Adam Lesinski
4309721843 Update DisplayMetrics even on default display
Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.

This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.

Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58
2016-10-14 18:16:18 +00:00
Andrii Kulian
a8a9bc5860 Make usage of Configuration.EMPTY safe
With current approach there is a high chance of making a programming
error and altering the state of singleton Configuration.EMPTY object,
because previously configuration was usually set by link to it.

This CL changes the behavior to create Configuration member objects
only once and alter their state afterwards.

Test: Manual and existing tests still pass.
Change-Id: Ie267c2fbf555f137670b7bd2cd251b817c69bc8e
2016-10-14 11:00:13 -07:00
Joe Onorato
073e4e40e6 Merge "Add android.util.proto package as an @TestApi." 2016-10-14 17:41:10 +00:00
Wale Ogunwale
df241e9771 Allow home activity to be resizeable if it explicitly wants to be.
We previously didn't allow home activities to be resizeable due to not fully
understanding how the UX would work. We now have a better idea of how the UX will
work. However, since this is a behavior change for home activities we require them
to explicitly say they want to be resizeable vs. the framework assuming they can
be resizeable based on their target sdk.

Bug: 30982291
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
Change-Id: I41aefc8c3b3da4c2cf66be81835222196df3ef26
2016-10-14 07:12:31 -07:00
Wale Ogunwale
72a73e3473 Track making activity resizeable based on sdk version separately.
To support resizeable home activities we need to make the home activity
resizeable only when the app explicitly says it is resizeable. To be able
to do that we need to track if we are allowing the app to be resizeable
due to the sdk version it is targetting separately from it explicitly
setting it so that activity manager and window manager can make the right
choices in a follow-up CL.

Bug: 30982291
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
Change-Id: I10f53ee9e57a41a3edece91cf68c5e8ef4bf4489
2016-10-14 07:11:20 -07:00
Robert Sesek
856a791ddd Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-10-14 14:08:00 +00:00
Wale Ogunwale
3eadad7566 Removed ActivityInfo.RESIZE_MODE_CROP_WINDOWS and related code.
The 2-finger gesture feature which this code is used for never
shipped and was removed from the code base.

Test: Existing tests pass.
Change-Id: I1540c8729fe87fef8e39b41747438557a8da2fa6
2016-10-14 07:05:57 -07:00
Julia Reynolds
3752e50766 Merge "Add support for snoozing notifications" 2016-10-14 12:38:17 +00:00
Jerry Zhang
7a396be6d5 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
2016-10-13 17:32:21 -07:00
Michal Karpinski
fd0d22750f Don't expose default strong auth timeout as constant am: 6dbf67fc48
am: bc755da55c

Change-Id: Idb118df5cf1a763645f4187bcddfa4bb9b8b42ee
2016-10-13 23:00:24 +00:00
Michal Karpinski
bc755da55c Don't expose default strong auth timeout as constant
am: 6dbf67fc48

Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43
2016-10-13 22:52:38 +00:00
TreeHugger Robot
a6b3caf58e Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev 2016-10-13 22:47:30 +00:00
Christopher Tate
7cfcf2d1b3 Only full-data back up regular files + directories am: da2018efeb am: 0d816b8f69
am: 86208efdc9

Change-Id: I3e39c52cf9895de9b893b7ec6c8d3287af7693b0
2016-10-13 21:23:58 +00:00
Greg Plesur
f38aac7fc0 DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade. am: 3514404984
am: 43ed3a5b6a

Change-Id: I20248c835034935c25ee6fa25f8eeeb9125f121e
2016-10-13 21:19:17 +00:00
Christopher Tate
86208efdc9 Only full-data back up regular files + directories am: da2018efeb
am: 0d816b8f69

Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396
2016-10-13 21:17:09 +00:00
Christopher Tate
0d816b8f69 Only full-data back up regular files + directories
am: da2018efeb

Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
2016-10-13 21:13:00 +00:00
Greg Plesur
43ed3a5b6a DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade.
am: 3514404984

Change-Id: I8d24007831ba030af0d84f717802c79172db970f
2016-10-13 21:12:51 +00:00
TreeHugger Robot
b3ca7c26e1 Merge "Only full-data back up regular files + directories" into nyc-mr1-dev 2016-10-13 21:07:00 +00:00
Greg Plesur
216ee1f0e7 Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev 2016-10-13 21:02:01 +00:00
TreeHugger Robot
0604869427 Merge "Switch UM to internal isUserUnlockingOrUnlocked" 2016-10-13 20:50:41 +00:00
Robert Sesek
aa3c463a5b resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp
Change-Id: I374d842cab49b58b570d5ad7ef3dffb7b148d236
2016-10-13 16:49:47 -04:00
Dianne Hackborn
8888aedc1f Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7 am: 9774ea3646
am: 50468217c4

Change-Id: I949e6337546835a0673b85ee6e2ad67fb0a0fec4
2016-10-13 20:44:47 +00:00
Dianne Hackborn
50468217c4 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
2016-10-13 20:38:04 +00:00
Dianne Hackborn
9774ea3646 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am: 851ec49de7

Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
2016-10-13 20:31:43 +00:00
TreeHugger Robot
16c9e8bac7 Merge "Visualize view focus in debug mode." 2016-10-13 20:28:57 +00:00
Julia Reynolds
72f1cbb3b9 Add support for snoozing notifications
To a notification listener, snoozing will appear as a cancel
(with reason snoozed) followed by a post (when the snooze period
ends).

Apps can repost a snoozed notification, but the updates will not be shown
to the user until the snooze period ends.

Snoozing is canceled if the posting app or a notification listener
cancels the notification.

Any notification listener can snooze a notification. Technically apps
can snooze their own notifications also, though that's not public.

In this iteration snoozed notifications will be lost on device reboot.

Test: included. Also, various post, snooze, update, cancel tests with
a listener.

Bug: 30997603
Change-Id: I568a6448196f0992a17d20a4dac296321ec5092b
2016-10-13 16:18:11 -04:00
Christopher Tate
da2018efeb Only full-data back up regular files + directories
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.

Bug 32143362

Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
2016-10-13 12:19:45 -07:00
Greg Plesur
3514404984 DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.

BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
2016-10-13 15:08:14 -04:00
Vladislav Kaznacheev
1ed3c63bb8 Merge "Avoid sending incorrect or redundant hover events." 2016-10-13 18:29:20 +00:00
Makoto Onuki
4e5434ba5a Merge "Pass client package name to GAL providers (framework)" 2016-10-13 17:49:17 +00:00
Fyodor Kupolov
c413f7078d Switch UM to internal isUserUnlockingOrUnlocked
Internal version of UMS maintains a self-locking data-structure of user
states that  is pushed from ActivityManager. Previously there could
be discrepancies between UMS.isUserUnlockingOrUnlocked and
UM.isUserUnlockingOrUnlocked, which is calling a blocking version
in ActivityManager.

Test: manual + UserManagerTests

Bug: 31995235
Bug: 31833240
Change-Id: Ibafe403f57cd32d9052bb55fe7273a861be1d037
2016-10-13 10:07:20 -07:00
TreeHugger Robot
b4d116f1c6 Merge "Fixing unit issue in dis/charge time remaining parameter." 2016-10-13 01:49:03 +00:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
2016-10-12 18:17:58 -07:00
Joe Onorato
6c9547d8e1 Add android.util.proto package as an @TestApi.
The classes there add a way for the platform to write out
protocol buffers that doesn't require lots of small objects,
generate code, and extra copying.

Includes the plugin for protoc to generate the constants.

Test: proto cts tests

Change-Id: I6385c198cecda9ac6fa533151609e3ace341af01
2016-10-12 16:37:18 -07:00
Adrian Roos
d92272138d Fix Notification.Action.Builder copy constructor am: 7af5362571 am: 342bc437bf
am: 7bc84b803d

Change-Id: Ice60b61b4868d775b04423e7166182db382d28b2
2016-10-12 23:33:11 +00:00