Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
270,477 Commits 3 Branches 0 Tags
adae4b4cb42e4235adea2c9427ba6df8e2eac677
Commit Graph

14133 Commits

Author SHA1 Message Date
Makoto Onuki
02f355df6b Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp 
am: 24c52732d7

Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f
 2016-06-22 00:55:32 +00:00
Yorke Lee
c502ca33ed Merge \\\"Tweaks to DragAndDropPermissions behavior\\\" into nyc-dev am: 22faa5ddb1 am: 072ce0c29c 
am: bf18ee7b76

Change-Id: Ib9dc30baa67a137749b2cb6bafe5ccb0de48d769
 2016-06-21 23:56:51 +00:00
Makoto Onuki
5665a66b44 Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev 
am: 3c67b3e47c

Change-Id: If7346f3dea63a31592d430b7503af170cb354677
 2016-06-21 23:50:32 +00:00
Yorke Lee
bf18ee7b76 Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am: 22faa5ddb1 
am: 072ce0c29c

Change-Id: Iee2afec7bd3b6d6a81ce179df9e52a9e20bc1b72
 2016-06-21 23:37:51 +00:00
Makoto Onuki
b5a012fd6f Shortcut Manager: Address API council feedback and fix TODOs 
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088

Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
 2016-06-21 14:42:48 -07:00
Yorke Lee
072ce0c29c Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev 
am: 22faa5ddb1

Change-Id: Icbe2a2b78d19dbdf067aa69a2e0c539a809893aa
 2016-06-21 21:20:11 +00:00
Yorke Lee
c8ad0cd316 Tweaks to DragAndDropPermissions behavior 
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
 2016-06-21 12:57:52 -07:00
Sanket Padawe
a073a5261e Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a08 
am: ac9cfbf548

Change-Id: I68771c36a436f6ccaaacc959604c6e416af8ee96
 2016-06-21 17:25:21 +00:00
Sanket Padawe
ac9cfbf548 Merge \"Unhide Network types in TelephonyManager\" into nyc-mr1-dev 
am: 0df9721a08

Change-Id: I967f047882ef07aa8d5deb88a5ad379a3b37257d
 2016-06-21 17:17:58 +00:00
Sanket Padawe
0df9721a08 Merge "Unhide Network types in TelephonyManager" into nyc-mr1-dev 2016-06-21 16:56:24 +00:00
Sanket Padawe
4652826d71 Unhide Network types in TelephonyManager 
Bug: 29493935
Change-Id: Ib1bef4a68a962b0f473e07415d46ecff6080ea71
 2016-06-20 12:40:07 -07:00
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