Commit Graph

16320 Commits

Author SHA1 Message Date
Jason Monk
9f37fa92e0 Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe
am: b3963766c6

Change-Id: I9601140fb9d24cec74d3c028240acaa1b7d0113d
2017-04-03 19:27:26 +00:00
Jason Monk
b3963766c6 Merge "Add test API for if the device supports QS" into oc-dev
am: be436bdefe

Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2
2017-04-03 19:22:35 +00:00
Jason Monk
be436bdefe Merge "Add test API for if the device supports QS" into oc-dev 2017-04-03 19:11:44 +00:00
Winson Chung
79804e6b94 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff
2017-04-03 18:47:49 +00:00
Brad Ebinger
0f7e7c59f4 Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev am: 57132a1513
am: 6f4841bd3b

Change-Id: I73d709b8763c0859b13c621d530d5614d93c8ca2
2017-04-03 18:36:51 +00:00
Winson Chung
0ed0b685b4 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
2017-04-03 18:36:26 +00:00
Brad Ebinger
6f4841bd3b Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45
2017-04-03 18:25:48 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
2017-04-03 18:25:36 +00:00
Winson Chung
34ecbaa991 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 2017-04-03 18:23:31 +00:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
Brad Ebinger
57132a1513 Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev 2017-04-03 18:12:42 +00:00
Chad Brubaker
e35d50622c Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev 2017-04-03 17:34:13 +00:00
TreeHugger Robot
5b01105ca3 Merge "Expose ConfigUpdater Intents in SystemApi" 2017-04-03 06:05:18 +00:00
Pankaj Kanwar
1ce83f009e Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." 2017-04-03 01:31:40 +00:00
Nathan Harold
e74c3dd1b0 IpSecManager and IpSecTransform API Cleanup am: 48b566557d am: 5eaf5393a5 am: 37f260f5d8
am: 5b0577dd31

Change-Id: I3ab5922127950cc6bca042d6ab43fb10a5b83431
2017-04-02 00:43:05 +00:00
Nathan Harold
5b0577dd31 IpSecManager and IpSecTransform API Cleanup am: 48b566557d am: 5eaf5393a5
am: 37f260f5d8

Change-Id: Ie84a720356466000930030de6f7a9182500afadb
2017-04-02 00:33:17 +00:00
Nathan Harold
5eaf5393a5 IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d
2017-04-02 00:18:42 +00:00
Jakub Pawlowski
260846b31b Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
(cherry picked from commit 5a355610fe)
2017-03-31 22:47:19 -07:00
Jakub Pawlowski
a537b3f1f8 Hide periodic scanning
Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
(cherry picked from commit 63fad69a19)
2017-03-31 22:47:17 -07:00
Jakub Pawlowski
c4e5e382d2 Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b am: 96e331fb1c
am: 2ed8b54ee3

Change-Id: I132fc3ef24fd19600675d431a40e7e03afb75f9f
2017-04-01 04:59:52 +00:00
Jakub Pawlowski
2ed8b54ee3 Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b
am: 96e331fb1c

Change-Id: I1522cf1e15178f2680f5483e6bb4e0d30be1bb80
2017-04-01 04:54:55 +00:00
Jakub Pawlowski
8c5b5b0c4b Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06
2017-04-01 04:42:45 +00:00
Jakub Pawlowski
5a355610fe Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
2017-04-01 04:34:40 +00:00
Romain Guy
0e5adc0d78 Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev am: 81b292abdf
am: 66421a8d81

Change-Id: Ib4f0f82441553ff8862f6f4d2dc7e6ef61f16e47
2017-04-01 04:32:15 +00:00
Romain Guy
66421a8d81 Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
am: 81b292abdf

Change-Id: I75e541ec15651f63a47dac8f20e1955548f87f58
2017-04-01 04:22:17 +00:00
TreeHugger Robot
81b292abdf Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
* changes:
  Documentation for PorterDuffXfermode
  Query color space before decoding a bitmap
2017-04-01 04:17:48 +00:00
TreeHugger Robot
5ac0d27178 Merge "Add hidden SystemApi for two setup wizard actions" 2017-04-01 03:57:21 +00:00
Felipe Leme
09173fc216 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev am: 4d558930c8
am: 7de522c966

Change-Id: I938906a27bc95b7e200fe1f1211dd757641209f4
2017-04-01 02:48:10 +00:00
Felipe Leme
7de522c966 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev
am: 4d558930c8

Change-Id: I81b4396e998b375feca626e5c0bc188b5f85cb09
2017-04-01 02:39:50 +00:00
TreeHugger Robot
4d558930c8 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev 2017-04-01 02:34:03 +00:00
Winson Chung
5af42fc305 Ensuring multi-window callbacks contain new configuration and are in order
- This CL has two main changes:
  1) It modifies the activity multi-window and picture-in-picture mode
     changed callbacks to provide the configuration of the activity with
     the mode applied.
  2) It modifies the order in which the multi-window and picture-in-picture
     mode callbacks are made, to ensure that when going in and out of
     picture-in-picture: first PiP, then MW, and then the config change.
- Previously, the ordering of the two callbacks was inconsistent.  When
  calling moveActivityToPinnedStack(), we reparent the task into the pinned
  stack (triggering the picture-in-picture mode change), followed by the
  resize animation (causes configuration changes).  Inversely, when we
  expand the task to fullscreen (and not just remove it), we run the
  animation first, which resizes the task to the final size (causes
  configuration changes) then reparent after the animation completes
  (triggering the picture-in-picture mode change).

  In this CL, we ensure that for both the transition in and out of PiP, we
  defer to the bounds animation to trigger the PiP mode change.  Normal
  calls to reparent or adding a new task are unchanged.  When the PiP
  mode change is called from the animation, it provides the final target
  bounds which we use to calculate the target configuration of the activity
  for the callback.  If the bounds animation is interrupted, an update will
  also be scheduled if we change the fullscreen state we are animating to.

  To work around the issue where we are scheduling MW/PiP mode changes in
  both the animation and the configuration change, we also now keep track
  of each state internally in the ActivityRecord.

Bug: 36099777
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testConfigurationChangeOrderDuringTransition

Change-Id: I03513bc3a4d4a72c250983f22f079ce9d7a2cb40
Signed-off-by: Winson Chung <winsonc@google.com>
2017-03-31 17:04:26 -07:00
Dianne Hackborn
cc88ddd7ea Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d3f
am: 666fe849e3

Change-Id: I61afc96a01bc8bc5d637d65a3f9a84452babd3ed
2017-03-31 23:44:42 +00:00
Dianne Hackborn
666fe849e3 Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
am: 2d161b1d3f

Change-Id: I4aed07a3ad88f3b171e92aaa70f88bcc4da131b8
2017-03-31 23:29:01 +00:00
TreeHugger Robot
2d161b1d3f Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev 2017-03-31 23:21:11 +00:00
Brad Ebinger
7a8d352871 Move CALL_PRIVILEGED/EMERGENCY to @SystemApi
CALL_PRIVILEGED and CALL_EMERGENCY APIs are used
by vendors and Android Wear and should be moved
to @SystemApi to pass CTS tests.

Bug: 36566521
Test: CTS tests
Change-Id: I73a0b2c4e551b4738c4c322d9822a85ee19d269b
2017-03-31 22:14:53 +00:00
Tyler Gunn
d2bec1b9a1 Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev am: 9220ff1f5a
am: 9af9589937

Change-Id: Ieed863e86593c054e18db43ca354881e8834c322
2017-03-31 20:25:38 +00:00
Tyler Gunn
9af9589937 Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
am: 9220ff1f5a

Change-Id: I2bfe8a64253b73d26377985768d5a6aa4b470dc6
2017-03-31 20:21:19 +00:00
Tyler Gunn
9220ff1f5a Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev 2017-03-31 20:14:58 +00:00
BIN ZHOU
b4df7b2d9e Add feature constants in Call Log provider to identify HD and WIFI calls.
Makes use of existing features column in the provider.

Test: Manual
Bug: 35359461
Change-Id: I405893771a2dac2bb25a54065238917ac2d515c8
2017-03-31 13:09:08 -07:00
pkanwar
89731a8389 Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
2017-03-31 12:16:56 -07:00
Nathan Harold
48b566557d IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
 This is essentially a less-safe method overload, and it is both
 unnecessary and difficult to implement: the cross-validation
 between SPI and Transform is actually useful, and the kernel
 requires two different mechanisms to use an unreserved vs a
 reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
 hard to support. API Council has questioned the value of this,
 and they are right: everything points to "remove this". In the
 future, if we find that SPI reservation is overhead, we can
 always add it back.

-Hiding the TunnelMode builder method and application/remove
 methods. These will not land by the time the next API
 stabilizes, so better to hide them now that this is a
 near-certainty. Expectation is to un-hide them in the subsequent
 API bump.

Bug: 36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
2017-03-31 11:21:10 -07:00
Chad Brubaker
0c1651f289 Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS
Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
2017-03-31 11:20:02 -07:00
Garfield Tan
0f04cf094a Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev am: f6d9507a00
am: cf3bc18f37

Change-Id: I8308f7bbb0ad5d496c3853bc4edc32851ca99a70
2017-03-31 18:16:08 +00:00
Garfield Tan
cf3bc18f37 Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev
am: f6d9507a00

Change-Id: I331a447f0171c9eb3d3b564cfc170d5bf60e74b9
2017-03-31 18:11:08 +00:00
Garfield Tan
f6d9507a00 Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev 2017-03-31 18:04:54 +00:00
Dianne Hackborn
a47223f99b Implement issue #36590595: Add ability to associated a ClipData with JobInfo
Yum!

Also needed to have a Context.revokeUriPermission() variant that is sane,
so reasonable CTS tests can be written.

Test: new ClipDataJobTest added.

Change-Id: Ia3135ea788a6e32c971bae7dab3a844d0ef4139c
2017-03-31 10:41:50 -07:00
Julia Reynolds
8e6cb82a1a Merge "Rename badge icon method" into oc-dev am: ed8d07f213
am: 52e063ee15

Change-Id: If360b1c8a5f84c0be519cc8ce7e472c23608c202
2017-03-31 16:51:51 +00:00
Julia Reynolds
52e063ee15 Merge "Rename badge icon method" into oc-dev
am: ed8d07f213

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
2017-03-31 16:41:27 +00:00
Julia Reynolds
ed8d07f213 Merge "Rename badge icon method" into oc-dev 2017-03-31 16:34:03 +00:00
Romain Guy
90fc43b33d Query color space before decoding a bitmap
This follows the pattern established by other "out" fields
in BitmapFactory.Options

Bug: 32984164
Test: CtsGraphicsTestCases

Change-Id: Ie72e47338b578b41c550453e2698d2d49eddf6da
2017-03-31 09:09:57 -07:00