Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
269,538 Commits 3 Branches 0 Tags
045de3f08cd3ca0e884e4e36dff7d448f9788018
Commit Graph

14122 Commits

Author SHA1 Message Date
Yohei Yukawa
045de3f08c Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37 
am: 0d7dcf7bc3

Change-Id: I5c4209a79e7426192da082100ac2a7517de36b81
 2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3 Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev 
am: 01e7c10d37

Change-Id: I5aa903ee453a3945d3f2710d2b6734443fcbd972
 2016-06-17 23:31:12 +00:00
Yohei Yukawa
01e7c10d37 Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev 2016-06-17 23:23:59 +00:00
Jack Yu
f9529b5a48 Merge "Added a new configuration for data call setup permanent failure" 2016-06-17 22:02:51 +00:00
Makoto Onuki
cb0f366fe2 Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609 
am: 5a533c9ae3

Change-Id: If46b8c1763b3682c780dcbaef1a790c1a5b9ded6
 2016-06-17 21:51:37 +00:00
Makoto Onuki
5a533c9ae3 Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev 
am: a65d8b6609

Change-Id: I7f7b88bb468e608e28ecb2af3b2455ae75e812af
 2016-06-17 20:40:16 +00:00
Makoto Onuki
df6da040e0 Update manifest shortcut XML schema 
Use the standard <intent> tag instead of custom tags.

- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it

Bug 29390156
Bug 29077932
Bug 29422018

Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
 2016-06-17 11:51:20 -07:00
Jack Yu
8a81a21777 Added a new configuration for data call setup permanent failure 
bug: 28728821
Change-Id: I441df1483dfa3d4bc1ea566a98b17bd3deddc193
 2016-06-17 10:37:37 -07:00
Yohei Yukawa
adebb52588 API Rename: IC#inputContent to IC#commitContent. 
As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
 2016-06-17 10:10:39 -07:00
Donghyun Cho
16a630d945 Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata" 2016-06-17 02:03:14 +00:00
Yi Kong
158ef35824 Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185 
am: 75aee6f266

Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649
 2016-06-16 16:33:13 +00:00
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
Przemyslaw Szczepaniak
aa021e854e Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
 2016-06-16 15:15:17 +01:00
Joachim Sauer
020a748bcc Merge \\\\"API updated for ICU4J 57.1\\\\" am: 4861329f57 am: 438dc91a41 am: 69147f24ae 
am: 3ac8348d00

Change-Id: I811b6eabe9587c704afac941bbf1385798f7957b
 2016-06-16 13:17:47 +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
fbfe52fe31 Merge \\\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\\" am: 47ef3bf172 am: d37e23c50c am: 720f31e238 
am: 90e517991b

Change-Id: Iac9e82f2ca567d8f56d556f5dd0a8339cccb153e
 2016-06-16 12:46:19 +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
Donghyun Cho
3cea6d542d Add bluetooth folder type information to MediaDescription and MediaMetadata 
Bug: 28210080
Change-Id: Id476fe742c35138b7d83c4440b3f85c0d104df82
 2016-06-16 16:26:49 +09:00
Hall Liu
b03b9aa61b Merge \\"Add support for Telecom analytics extensions\\" into nyc-mr1-dev am: 81ce5bc113 
am: 31d9aa4f28

Change-Id: Ib19ee7012889b316dc7b9ad73db365c22e2217a1
 2016-06-15 23:06:58 +00:00
Erik Wolsheimer
28a04413b8 Merge \\"Add DENSITY_260, DENSITY_300, DENSITY_340\\" into nyc-mr1-dev am: e37ee119c2 
am: 4d4d4706ab

Change-Id: Ib807e30b2c8ea58592df33ceb9d1e1344e7dce04
 2016-06-15 22:58:23 +00: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
Alexander Hills
eb4420a985 Merge \\"Adds a flag to Action.WearableExtender to display actions inline on Wear\\" into nyc-mr1-dev am: 7816efa6af 
am: c295774697

Change-Id: I652a85b763cd12f9ea5e5e2ef28aeeab4cba79f3
 2016-06-15 19:40:19 +00:00
Jean-Michel Trivi
02b01b0a68 Merge "Add MediaCodecInfo profile constant for AAC ER Scalable" 2016-06-15 19:36:22 +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
Jean-Michel Trivi
7c1cb0d5a5 Add MediaCodecInfo profile constant for AAC ER Scalable 
Bug 29221608

Change-Id: I068efcb4c67ad3c2f6ced49157b76766a57d37a5
 2016-06-13 17:56:29 -07:00
Yohei Yukawa
e3d3740f1c Merge \\"Add InputConnection#insertContent().\\" into nyc-mr1-dev am: 03f759e87e 
am: 176642ec2c

Change-Id: I96395b6e883aa7dd462d1281b6859afa7b324937
 2016-06-14 00:52:36 +00: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
94300f1949 Merge \\"Add EVENT_CALL_MERGE_FAILED Connection Event\\" into nyc-mr1-dev am: a3d4baf43b 
am: 3b76cb7609

Change-Id: I3c620b7e50ab294d617ab3a4d5c11e96b7dd2bd9
 2016-06-13 17:45:27 +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
3fec7a80fb Merge \\"Add RecoverySystem.rebootWipeAb() system API.\\" into nyc-mr1-dev am: 9aa66d57c6 
am: 20f5cd8d9e

Change-Id: Icf1be48feace06ad193a95f70df39ae979036306
 2016-06-13 16:54:50 +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