Commit Graph

16302 Commits

Author SHA1 Message Date
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
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
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
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
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
Tyler Gunn
3d9286e650 Merge "Self Managed CS Implementation" into oc-dev 2017-03-31 15:06:47 +00:00
Aaron Whyte
9ce24968e7 Merge "Split scroll factor into a 2d float." into oc-dev
am: 774b1f1f37

Change-Id: I1424f902aba4580258539db4327c66f4a4532045
2017-03-31 15:00:56 +00:00
TreeHugger Robot
774b1f1f37 Merge "Split scroll factor into a 2d float." into oc-dev 2017-03-31 14:54:45 +00:00
Tyler Gunn
56b33d9e13 Merge "Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3 am: 72cb924f07" into oc-dev-plus-aosp
am: 9afea67cea

Change-Id: I9758157926f7d39361994d27823cbdb86ac5ba38
2017-03-31 04:43:28 +00:00
Abodunrinwa Toki
225fff9a27 Merge "TextClassificationManager API cleanup." into oc-dev am: f9533e7b4d
am: b4d96143b7

Change-Id: Iafc610d668b53aee127796d9e5933b981d32e3e6
2017-03-31 04:42:16 +00:00
Android Build Merger (Role)
9afea67cea Merge "Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3 am: 72cb924f07" into oc-dev-plus-aosp 2017-03-31 04:39:10 +00:00
Tyler Gunn
4c4405c19d Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3
am: 72cb924f07

Change-Id: Ia16c6125567ceac4edfff095e737751c46fde7bf
2017-03-31 04:38:18 +00:00
Abodunrinwa Toki
b4d96143b7 Merge "TextClassificationManager API cleanup." into oc-dev
am: f9533e7b4d

Change-Id: Id7912117e9aaca4c9b8eee24cb72f6085219453c
2017-03-31 04:37:47 +00:00
TreeHugger Robot
f9533e7b4d Merge "TextClassificationManager API cleanup." into oc-dev 2017-03-31 04:29:27 +00:00
Tyler Gunn
dd8756d514 Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Merged-In: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
2017-03-30 21:28:19 -07:00
Tyler Gunn
9fab4ad9b3 Merge "Self Managed CS Implementation"
am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd
2017-03-31 04:26:27 +00:00
Treehugger Robot
98fad21a8a Merge "Self Managed CS Implementation" 2017-03-31 04:11:54 +00:00
Tao Bai
90c9edd5b8 Merge "Override View.autofill() method and call into ViewDelegate" into oc-dev am: c7f474668e
am: b487ff7aa4

Change-Id: I35cbc825fe6e0d1ec9cbc95ec7a242175606c551
2017-03-31 03:08:40 +00:00
Tao Bai
b487ff7aa4 Merge "Override View.autofill() method and call into ViewDelegate" into oc-dev
am: c7f474668e

Change-Id: I881a7a6b0b5f471f0981d189d3517886b35a3db6
2017-03-31 03:04:40 +00:00
TreeHugger Robot
c7f474668e Merge "Override View.autofill() method and call into ViewDelegate" into oc-dev 2017-03-31 02:57:38 +00:00
Tyler Gunn
3765356699 Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
2017-03-30 19:00:41 -07:00
Philip P. Moltmann
4a61ca5ef6 Merge "Rename autoFillHint to autoFillHints." into oc-dev
am: 1a098cf62b

Change-Id: I8e20dac31fac8becbdd553b436a8a38312979e50
2017-03-31 01:47:35 +00:00