Commit Graph

13537 Commits

Author SHA1 Message Date
Yi Kong
75aee6f266 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am: 53cf79e185

Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
2016-06-16 16:21:03 +00:00
Yi Kong
53cf79e185 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp 2016-06-16 16:17:49 +00:00
Yi Kong
ade5c7c893 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit af823e0ebf)
2016-06-16 17:14:36 +01:00
Przemyslaw Szczepaniak
81368e08e0 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am: 7d09db2830

Change-Id: I57f72e630688d91ca56adfb910232358746777e0
2016-06-16 16:07:49 +00:00
Przemyslaw Szczepaniak
7d09db2830 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854e)
2016-06-16 15:58:27 +00:00
Fredrik Roubert
3ac8348d00 Merge \\\"API updated for ICU4J 57.1\\\" am: 4861329f57 am: 438dc91a41
am: 69147f24ae

Change-Id: Ic62119248aeef08141a3f6a9b2d948529997cbcc
2016-06-16 13:12:13 +00:00
Fredrik Roubert
438dc91a41 Merge \"API updated for ICU4J 57.1\"
am: 4861329f57

Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c
2016-06-16 13:03:50 +00:00
Przemyslaw Szczepaniak
90e517991b Merge \\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\" am: 47ef3bf172 am: d37e23c50c
am: 720f31e238

Change-Id: I97f561820d6cb9550e92c2bf2b83017889afc069
2016-06-16 12:42:40 +00:00
Joachim Sauer
4861329f57 Merge "API updated for ICU4J 57.1" 2016-06-16 12:38:30 +00:00
Przemyslaw Szczepaniak
d37e23c50c Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
2016-06-16 12:33:21 +00:00
Przemyslaw Szczepaniak
a82f0622f1 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
2016-06-16 13:07:31 +01:00
Hall Liu
31d9aa4f28 Merge \"Add support for Telecom analytics extensions\" into nyc-mr1-dev
am: 81ce5bc113

Change-Id: I0902866046098d6fe23cf093b561008958ba29e2
2016-06-15 21:32:05 +00:00
Hall Liu
81ce5bc113 Merge "Add support for Telecom analytics extensions" into nyc-mr1-dev 2016-06-15 21:24:16 +00:00
Erik Wolsheimer
4d4d4706ab Merge \"Add DENSITY_260, DENSITY_300, DENSITY_340\" into nyc-mr1-dev
am: e37ee119c2

Change-Id: Ida84134da4145843fa982abf1428790c692a24d6
2016-06-15 20:58:49 +00:00
Erik Wolsheimer
178bba4589 Add DENSITY_260, DENSITY_300, DENSITY_340
Add supported screen densities to closer match some hardware's physical specifications

BUG: 24132725
Change-Id: I7138d92fa4e1f4320f9068e154bd8318ac0c45c7
2016-06-15 10:33:09 -07:00
Alex Hills
c295774697 Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
am: 7816efa6af

Change-Id: Idcf5a780abc93b3a7c5d3e497b98352ddc26d257
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev 2016-06-15 16:02:48 +00:00
Hall Liu
057def534c Add support for Telecom analytics extensions
Add classes for call events and a field for them in
ParcelableCallAnalytics.
Add classes for timing information on user-visible operations.
Add the TelecomAnalytics class as the top-level object for analytics.
Add log session timing information to the TelecomAnalytics class,
independent of individual calls.

Bug: 28623064
Change-Id: Ifee5fdf6b6b341869ff0ff26c4388d357e3d9922
2016-06-14 16:37:10 -07:00
Fredrik Roubert
0af16f3d36 API updated for ICU4J 57.1
Bug: 27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
2016-06-14 15:03:51 +02:00
Yohei Yukawa
176642ec2c Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
am: 03f759e87e

Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
2016-06-14 00:38:47 +00:00
Yohei Yukawa
03f759e87e Merge "Add InputConnection#insertContent()." into nyc-mr1-dev 2016-06-14 00:26:39 +00:00
Brad Ebinger
3b76cb7609 Merge \"Add EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev
am: a3d4baf43b

Change-Id: I56f5854a39325671b1854ce453a416eb24b9c8a8
2016-06-13 17:41:51 +00:00
Brad Ebinger
a3d4baf43b Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev 2016-06-13 17:39:19 +00:00
Tao Bao
20f5cd8d9e Merge \"Add RecoverySystem.rebootWipeAb() system API.\" into nyc-mr1-dev
am: 9aa66d57c6

Change-Id: I54cdfff9c5d82daaac50b18a79f87b477863f643
2016-06-13 16:50:41 +00:00
Tao Bao
9aa66d57c6 Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Yohei Yukawa
152944f490 Add InputConnection#insertContent().
Providing an official protocol for IMEs to insert an image to the
application is something that has been requested from many IME
developers to Android OS.  With this CL, IMEs are able to ask
applications to insert a content including image files as follows.

 1. An application that opts in to this protocol specifies a list of
    supported content MIME types in EditorInfo#contentMimeTypes.
 2. When an IME is actively interacting with such an application, the
    IME can call InputConnection#insertContent() with a InputContentInfo
    that contains content URI, metadata (ClipDescription), and an
    optional link URI.
 3. The application can read the stream data from the given content URI
    to insert the content into somewhere in the application.

Detailed design background can be found in the JavaDoc of
InputConnection#insertContent().

Bug: 22830793
Change-Id: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
2016-06-10 19:04:34 -07:00
Tao Bao
1327a97a07 Add RecoverySystem.rebootWipeAb() system API.
It reboots into recovery and securely wipes an A/B device.

Bug: 27253717
Bug: 29159185
Change-Id: I8252894db5c1df48bc4a8728b7f0e0f18aebc44c
2016-06-09 16:57:54 -07:00
Alex Hills
9f08761f08 Adds a flag to Action.WearableExtender to display actions inline on Wear
Bug:28909490
Change-Id: I124bdd0a91ed7d78c527988e390b823dcbd1b85f
2016-06-08 15:42:04 -04:00
Amith Yamasani
b8ab1d3b12 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp
Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970
2016-06-08 11:50:57 -07:00
Amith Yamasani
211b5b10f6 resolve merge conflicts of 718f321 to nyc-mr1-dev
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
2016-06-08 18:43:46 +00:00
Amith Yamasani
c33507d441 Merge \"Add a separate read permission for oem unlock state\" into nyc-dev
am: 718f321369

Change-Id: I934a06f985319d4520044aff7adf4329f0c27953
2016-06-08 18:16:40 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Makoto Onuki
a3a56ab9d1 Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev
am: 3bb4366006

Change-Id: Ic2adc036d256a0ad3da4f65a20edfc4cdeb30447
2016-06-08 17:11:55 +00:00
Makoto Onuki
157b1628fd ShortcutManager: deal with changing resource IDs on app update
- When an app is upgraded, all the resource IDs may change.  So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.

- So now the service also remembers resource names for icon resources,
as wells as string resources.  When an app is updated, the service
fetch the updated resource IDs by name.

- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.

- When the system locale changes, re-extract all string resources.

- Also really hide the constants in ShortcutInfo that were
accidentally made public.

Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960
2016-06-07 16:11:30 -07:00
Brad Ebinger
8f6b7a8caf Merge \"Adds CDMA Voice Privacy Property to Call\" into nyc-mr1-dev
am: 5eebdd8bb8

Change-Id: Ie647b2b460dded6a501f5c19849d610c29d5ebaa
2016-06-07 22:23:50 +00:00
Brad Ebinger
5eebdd8bb8 Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev 2016-06-07 22:14:51 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
2016-06-03 14:33:26 -07:00
Jeff Sharkey
b8fff382c6 Fix build after merge.
am: 9351225839

* commit '935122583967643979f103030b95afd59e57ff59':
  Fix build after merge.

Change-Id: I7c92c65266e623f8b245b4dcbbd6aef85eaef74b
2016-06-03 20:40:32 +00:00
Jeff Sharkey
9351225839 Fix build after merge.
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
2016-06-03 14:34:16 -06:00
Brad Ebinger
15847070b5 Adds CDMA Voice Privacy Property to Call
Adds the CDMA Enhanced Voice Privacy Property to a Call when it has been
enabled for the call by the network.

Bug: 26931679
Change-Id: I1f5b4a4fb22fe6aaaf0c424ef11925c6058c6e82
2016-06-03 13:34:07 -07:00
Wang Xiaolei
0c26c32403 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9
am: f5b0bf3563

* commit 'f5b0bf356350b53d02d6dfea96defd087f8c2f2a':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495
2016-06-03 20:01:37 +00:00
Jeff Sharkey
f5b0bf3563 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
2016-06-03 13:53:48 -06:00
Michael Wright
36481749e6 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
am: 44b24c9b38

* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
2016-06-03 19:27:36 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Todd Kennedy
a84b5d0ebd Merge "Round icons" into nyc-mr1-dev
am: 7d64d64269

* commit '7d64d642692ff6728ee83e1a0d8658909d1bdd44':
  Round icons

Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
2016-06-03 00:38:26 +00:00
Todd Kennedy
bb8a42da70 Round icons
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
2016-06-02 15:57:54 -07:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00