Commit Graph

70870 Commits

Author SHA1 Message Date
Bryce Lee
5a5626acd7 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp
am: ccd3468567

Change-Id: I5dac528db07b40bb9e59a090bd7e0016ca6e996a
2016-10-18 17:41:52 +00:00
Bryce Lee
ccd3468567 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
2016-10-18 10:07:00 -07:00
TreeHugger Robot
04ad536e05 Merge "Iteration on findPath API." 2016-10-18 16:57:04 +00:00
Philip P. Moltmann
ee53f0d419 Merge "Allow to select printer from info activity." 2016-10-18 14:55:51 +00:00
Philip P. Moltmann
8e9652a208 Merge "Clarify which props of USB devices are optional" 2016-10-17 23:27:14 +00:00
Sanket Agarwal
933c625a92 Merge "Remove APIs that are not directly usable." am: 9cff57312d
am: 086be31642

Change-Id: I5f95fe50d16b26601405816625f4aa45f2ef6647
2016-10-17 21:32:21 +00:00
Sanket Agarwal
086be31642 Merge "Remove APIs that are not directly usable."
am: 9cff57312d

Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d
2016-10-17 21:28:05 +00:00
TreeHugger Robot
0a8e926cda Merge "The bigger update to Canvas" 2016-10-17 20:06:30 +00:00
Sanket Agarwal
fb6322425a Remove APIs that are not directly usable.
The right way to expose this API is done via MediaBrowser.

Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa2)
2016-10-17 12:47:10 -07:00
Philip P. Moltmann
f2d83edc26 Clarify which props of USB devices are optional
Test: Compiles, manually inspected object creation code, ran USB CTS
verifier tests
Fixes: 32209658
Change-Id: I738c0cea5a0f37484e986f0a01c8ed9c46b639ed
2016-10-17 12:14:45 -07:00
John Reck
caa08ff5e9 The bigger update to Canvas
All draw* calls in Canvas are regular JNI
All draw* calls in DisplayListCanvas are FastNative
Unifies Canvas JNI on nMethodName naming

CanvasPerf results before:
INSTRUMENTATION_STATUS: basicViewGroupDraw_min=12492
INSTRUMENTATION_STATUS: recordSimpleBitmapView_min=13912

and after:
INSTRUMENTATION_STATUS: basicViewGroupDraw_min=11945
INSTRUMENTATION_STATUS: recordSimpleBitmapView_min=13318

Test: refactor, makes & boots
Change-Id: I06000df1d125e17d60c6498865be7a7638a4a13e
2016-10-17 11:33:28 -07:00
TreeHugger Robot
905e807ee2 Merge "Add an API for retrieving information about the current WebView package." 2016-10-17 18:06:48 +00:00
Makoto Onuki
cf6782c940 Merge "Don't expose raw usage stats to clients; return "low-res" values." 2016-10-17 17:41:43 +00:00
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
Gustav Sennton
bf683e07c3 Add an API for retrieving information about the current WebView package.
Now that WebView can be loaded from one out of a set of packages we
provide an API for fetching information about this package.
Such API is especially useful for debugging crashes.

Bug: 30597460

Change-Id: I13dd746f7efcf2917b517053010b73ea35241325
2016-10-17 07:26:37 +00:00
Yohei Yukawa
c75e8dbf15 Handle exceptions from #requestPermission() am: 93278ca144 am: f8621ff5bf
am: 36e5feffb7

Change-Id: I31405b72394d8425679e4b39ef89d4c68c2f9e11
2016-10-15 00:52:52 +00:00
Yohei Yukawa
36e5feffb7 Handle exceptions from #requestPermission() am: 93278ca144
am: f8621ff5bf

Change-Id: I682e19b9f0657f840536b558204faf37872a7b36
2016-10-15 00:44:43 +00:00
Yohei Yukawa
f8621ff5bf Handle exceptions from #requestPermission()
am: 93278ca144

Change-Id: I5e8a3a9a670b1e794ce3af670fb30ffc4b8302a5
2016-10-15 00:37:24 +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
Yohei Yukawa
93278ca144 Handle exceptions from #requestPermission()
This is a follow up CL to my previous CL [1] that let
IInputConnectionWrapper to call InputContentInfo#requestPermission()
automatically so that temporary URI permissions can be granted
automatically on API 25+ devices whenever
INPUT_CONTENT_GRANT_READ_URI_PERMISSION is specified.

However, in that CL we forgot to handle exceptions thrown from
InputContentInfo#requestPermission().  This is problematic because it is
actually easy for IMEs to cause SecurityException by specifying a
content URI that does not allow grantUriPermission, e.g.:

  inputConnection.commitContent(
          new InputContentInfo(Uri.parse("content://call_log/test"),
          new ClipDescription("test", new String[]{"image/gif"}));

As a result, IMEs can let the application crash at any time because
InputContentInfo#requestPermission() is automatically called inside the
Framework.

This CL makes sure that exceptions thrown from
InputContentInfo#requestPermission() can be handled gracefully.

 [1]: Id955435dd2e72549ee7134f46b3c6951581694ad
      f3806f57a5

Bug: 32162481
Change-Id: I08916a1f54518390d3b67ab1673dc901e3f9716a
2016-10-14 22:26:35 +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
Christopher Wiley
5149fef65f Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d am: 53d12379f4
am: 5f9fedc5d7

Change-Id: Id23911d3ff1e90cf88711a7aa7749acdd81a26ae
2016-10-14 19:44:26 +00:00
Garfield Tan
06940e1246 Iteration on findPath API.
* Extend this API to take tree URI
* Add toString(), equals() and hashCode() to Path
* Address Jeff's comments in ag/1513538
* Add unit tests for findPath

Bug: 30948740
Change-Id: Iaf852d0e40fae37623e9bb9ffa1c6fbe334c1b21
(cherry picked from commit d4ab7ade7171a4382ef4f61f2a5f078a17800e83)
2016-10-14 19:18:46 +00: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
Christopher Wiley
5f9fedc5d7 Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d
am: 53d12379f4

Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3
2016-10-14 14:21:39 +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
Philip P. Moltmann
c8d6f54be3 Allow to select printer from info activity.
Test: Manual testing with modified experimental print service and new
      CTS test for the new API
Fixes: 27746841
Change-Id: I4ef728e54679271a01397d9f04d3b8ac804ffcf3
2016-10-13 17:09:17 -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