Commit Graph

13190 Commits

Author SHA1 Message Date
Tao Bao
c0d4b37a16 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev am: 9971d02
am: 85b0ba3

* commit '85b0ba3cc369cc5106a5368434524ae479dfa00d':
  UpdateEngine: Add resetStatus() as system API.
2016-03-28 21:17:04 +00:00
Andrii Kulian
0b7964bdba Merge "Fix API numbering issues" into nyc-dev am: 162c9d04
am: b4da6e3

* commit 'b4da6e3d99be85efdd431bd6dfefcade43d27ac5':
  Fix API numbering issues
2016-03-28 21:16:29 +00:00
Brad Ebinger
7fde28455a Merge "Add VIA number column to CallLog Database" into nyc-dev am: 900f163
am: ca3c301

* commit 'ca3c3012df230e0c49906e18fdea93992d6313b2':
  Add VIA number column to CallLog Database
2016-03-28 21:16:01 +00:00
Lifu Tang
9c33c073cd Merge "Added missing constants to GnssMeasurement" into nyc-dev am: a89a392
am: 46d2e76

* commit '46d2e7673cd70797f0b1521bbf1aedc9adffe830':
  Added missing constants to GnssMeasurement
2016-03-28 21:13:22 +00:00
Tao Bao
9971d02c38 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 2016-03-28 19:51:36 +00:00
Andrii Kulian
162c9d0425 Merge "Fix API numbering issues" into nyc-dev 2016-03-28 19:28:23 +00:00
Brad Ebinger
900f1635c0 Merge "Add VIA number column to CallLog Database" into nyc-dev 2016-03-28 19:27:20 +00:00
Lifu Tang
a89a392aef Merge "Added missing constants to GnssMeasurement" into nyc-dev 2016-03-28 18:22:28 +00:00
Andrii Kulian
ad462701a8 Fix API numbering issues
This fixes issues with API numbering introduced in
2e751b8c77.

Original commit replaced 'minimalSize' resource with 'minimalWidth' and
'minimalHeight' and 'make update-api' shifted the numbering of other resources.
This change reverts the shift, reuses number of 'minimalSize' and adds
another one new.

Bug: 27528326
Change-Id: I7d327f00043c2bd2aab7285e03223a042e8c97a3
2016-03-28 11:16:31 -07:00
Shubham Ajmera
331cbd9c77 Merge "Add OpenJDK Arrays parallelSetAll methods" into nyc-dev am: 47f542f
am: aedf961

* commit 'aedf9610e3b042bb18742a5ab34da1c4346bd567':
  Add OpenJDK Arrays parallelSetAll methods
2016-03-28 11:12:10 +00:00
Shubham Ajmera
47f542fc04 Merge "Add OpenJDK Arrays parallelSetAll methods" into nyc-dev 2016-03-28 10:57:31 +00:00
Shubham Ajmera
88c2c90a12 Add OpenJDK Arrays parallelSetAll methods
Adds parallelSetAll(int[], java.util.function.IntUnaryOperator),
parallelSetAll(long[], java.util.function.IntToLongFunction),
parallelSetAll(double[], java.util.function.IntToDoubleFunction),
parallelSetAll(T[], java.util.function.IntFunction<? extends T>)
from the upstream along with the corresponding tests.

Bug: 27540010
(cherry-picked from commit 4293e554db)
Change-Id: Iaa4a0749d8bb95ea8a0072a43bfbd6d6f459ff28
2016-03-28 11:53:20 +01:00
Jeff Sharkey
9bd527d0f6 Merge "Include "invisible" volumes in new storage API." into nyc-dev am: 4d9b6e4
am: 0f6805e

* commit '0f6805ee0566d170c520610a9b2c0802ae930b62':
  Include "invisible" volumes in new storage API.
2016-03-28 05:49:05 +00:00
Jeff Sharkey
4d9b6e4f57 Merge "Include "invisible" volumes in new storage API." into nyc-dev 2016-03-28 05:18:40 +00:00
Andrii Kulian
11073cda39 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev am: 47869bd
am: d5afdc7

* commit 'd5afdc71c96960ec9acf405a8ae1222aba48ebf2':
  Update ActivityInfo#WindowLayout apis (1/3)
2016-03-28 00:34:11 +00:00
Andrii Kulian
47869bd446 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev 2016-03-28 00:25:01 +00:00
Andrii Kulian
2e751b8c77 Update ActivityInfo#WindowLayout apis (1/3)
Adds documentation, renames Layout to WindowLayout and
splits #minimalSize to #minimalWidth and #minimalHeight.

Bug: 27528326
Change-Id: Idb440cb081a14ccdc83309284e906454633c4504
2016-03-27 15:35:33 -07:00
Jeff Sharkey
c02bfae73e Include "invisible" volumes in new storage API.
The purpose of the new StorageVolume API is to grant access to
volumes that aren't typically "visible" to a developer, so include
them in the returned results.

Also return the real mounted state instead of augmenting based on
the caller's storage permissions.  Clean up API naming slightly and
return as List.

Bug: 27615770
Change-Id: Ida921a4b91e5af81e418e76f672d9108f45a9781
2016-03-27 15:06:57 -06:00
Jeff Sharkey
bdd6417989 Add methods to probe current storage state. am: c9a40cd
am: cd3af14

* commit 'cd3af14d2eea6d54c3227fa92fa17e57a6ed4e0b':
  Add methods to probe current storage state.
2016-03-27 19:27:04 +00:00
Jeff Sharkey
c9a40cd844 Add methods to probe current storage state.
Bug: 27811575
Change-Id: I2586fe3ec4d5c98c5b956f4b4a4cec425c81b0b1
2016-03-27 12:10:38 -06:00
Chad Brubaker
ba3624ecef Merge "Add handleTrustStorageUpdate" into nyc-dev am: e4c5c16
am: c24d142

* commit 'c24d142092da7407baedfb966d56bcefec4c0bf9':
  Add handleTrustStorageUpdate
2016-03-26 16:44:12 +00:00
Chad Brubaker
e4c5c161dd Merge "Add handleTrustStorageUpdate" into nyc-dev 2016-03-26 16:36:31 +00:00
Edward Cunningham
d0ee17d926 Merge "DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""" into nyc-dev 2016-03-25 22:01:07 +00:00
Chad Brubaker
bf9a82a643 Add handleTrustStorageUpdate
This pruns all the stored trusted issuers so that changes to the system
or user CA store are detected. Currently this is only exposed as a
TestApi, but it can be hooked up to the trusted storage change event
in a future commit.

Bug: 27526668
Change-Id: Ic426254babab9a3177c968bc05b45e95eaac1fdd
2016-03-25 14:48:44 -07:00
Edward Cunningham
abb2c5af8e DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""
This reverts commit c6f5738d3c.

Change-Id: Ibb330f44c3910b3fc124ee8c718a508cdf3b32b4
2016-03-25 20:56:31 +00:00
Lifu Tang
047b05ea6e Added missing constants to GnssMeasurement
Bug: 27816668
Change-Id: Ib1638f5ac3941c4b6d9babca0acdc80df498e0af
2016-03-25 12:56:32 -07:00
Philip P. Moltmann
62dc6583e6 Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev am: ebf3976
am: e3221b5

* commit 'e3221b5488aad3898abac47f6e28f4779c54543b':
  Change hasCustomPrintIcon and setStatus as requested by API council.
2016-03-25 17:08:26 +00:00
Philip P. Moltmann
ebf397625e Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev 2016-03-25 16:50:36 +00:00
Narayan Kamath
5916637474 Merge "Track libcore change df3cf7e4cf590086d1cdd09b6e0d3104de167e61." into nyc-dev am: 700c7f8
am: 99f72c7

* commit '99f72c733cf31b9ac1e3ed0fb0eb2db03d4b8c21':
  Track libcore change df3cf7e4cf590086d1cdd09b6e0d3104de167e61.
2016-03-25 10:29:08 +00:00
Narayan Kamath
700c7f80c1 Merge "Track libcore change df3cf7e4cf590086d1cdd09b6e0d3104de167e61." into nyc-dev 2016-03-25 10:20:51 +00:00
Sungsoo Lim
0c4e049438 Merge "MediaBrowser: Applying API Review" into nyc-dev am: 21c03f0
am: 0d94716

* commit '0d94716baf3869c8498b5149c7151ce739372f3d':
  MediaBrowser: Applying API Review
2016-03-25 04:39:58 +00:00
Sungsoo Lim
21c03f0c61 Merge "MediaBrowser: Applying API Review" into nyc-dev 2016-03-25 04:29:56 +00:00
Tyler Gunn
aaab3913f5 Merge "Add connection properties to Connections." into nyc-dev am: ad716eb
am: 2fcf461

* commit '2fcf461dd501d885754f19b9896dd5641a7332fd':
  Add connection properties to Connections.
2016-03-25 03:54:10 +00:00
Tyler Gunn
720c664401 Add connection properties to Connections.
- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.

Bug: 27458894
Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
2016-03-24 20:20:11 -07:00
Jiabin
4b03dd5dd3 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev am: 2dc6cc9
am: 93cccd6

* commit '93cccd6e61cbf3d51d1d98a28b9771a9940d10ec':
  TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)
2016-03-25 02:34:01 +00:00
Jiabin Huang
2dc6cc9aa4 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 2016-03-25 02:26:04 +00:00
Philip P. Moltmann
d74d1e5491 Change hasCustomPrintIcon and setStatus as requested by API council.
Bonus: null advanced keys produced a exception deep in the print
       spooler. Hence prevent null keys on the surface from now on.

Bug: 27716355
Change-Id: I3c064956f4e670cd7091437ade06605aa8d797b0
2016-03-24 16:53:36 -07:00
Robin Lee
287216fdc6 Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev am: 363e70d
am: 9148d2f

* commit '9148d2f74db74e1df017b9c7c73e8cd8fa0c50ff':
  Declare provider.Settings intent for VPN fragment
2016-03-24 18:39:52 +00:00
Robin Lee
363e70dd00 Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev 2016-03-24 18:32:52 +00:00
Abhijith Shastry
55bf009248 Merge "Add an unblock API to BlockedNumberContract." into nyc-dev am: d1ceef0
am: ef68f23

* commit 'ef68f23ef63fffedd3124dba03c4714af4797c27':
  Add an unblock API to BlockedNumberContract.
2016-03-24 17:40:09 +00:00
Abhijith Shastry
d1ceef09a7 Merge "Add an unblock API to BlockedNumberContract." into nyc-dev 2016-03-24 17:33:58 +00:00
Robin Lee
a249aee10b Declare provider.Settings intent for VPN fragment
Currently used for a number of tests. May also be useful for 3rd-party
apps using VPN in some manner or another.

Bug: 27700919
Bug: 26887434
Change-Id: I4d269954265a2590499e20150f009fe437c8078f
2016-03-24 17:25:06 +00:00
Narayan Kamath
13cdc371a2 Track libcore change df3cf7e4cf590086d1cdd09b6e0d3104de167e61.
bug: 27464570
Change-Id: I83d0b410ae7f928ba4545127ed7035772b21e12b
2016-03-24 16:38:20 +00:00
Clara Bayarri
cc80281911 Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev am: 3e5bf78
am: c84e36b

* commit 'c84e36b7ec77e52ab184c1328c55ee71f8ba4aa5':
  Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:41:42 +00:00
Clara Bayarri
3e5bf786b7 Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev 2016-03-24 13:30:48 +00:00
Clara Bayarri
09d9cc58e4 Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev am: bfd996f
am: 322e4d2

* commit '322e4d23eada2c456b551f1f7da0395dda791471':
  Keyboard Shortcuts: Add Keycodes for shortcut representation
2016-03-24 12:01:31 +00:00
Clara Bayarri
bfd996f5cd Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev 2016-03-24 11:49:05 +00:00
Clara Bayarri
fcd7e80b21 Keyboard Shortcuts: plumb deviceId through
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Clara Bayarri
4e850ffaa7 Keyboard Shortcuts: Add Keycodes for shortcut representation
This changes the current API given app feedback received. In order to use
keycodes as well as chars we also must implement a mapping of Keycodes to
Display labels as only keys with a single char representation are provided
by KeyCharacterMap.

Bug: 27409783
Change-Id: I3da653adc4b8cbc66a4d1aa24a5f9181f71e83c3
2016-03-24 11:47:23 +00:00
Abhijith Shastry
cdc2a4c737 Add an unblock API to BlockedNumberContract.
The delete API need not unblock a number if there are multiple copies of a single number.

BUG: 27790536

Change-Id: I6391b0c095827afe85f2ee5d1756741e144c8c26
2016-03-23 19:29:59 -07:00