Commit Graph

24573 Commits

Author SHA1 Message Date
TreeHugger Robot
70974aa123 Merge "New intent action for speakerphone state change" 2019-03-19 15:34:07 +00:00
Paul Hu
7ccfdd170e Merge "Revert "Rename some failed causes"" am: e3cc2e6c98 am: 90e2f900ca
am: 778f372e23

Change-Id: I82c8bfb9a5f08d7ca205b2f18282f5346709b2e0
2019-03-19 08:05:53 -07:00
Paul Hu
778f372e23 Merge "Revert "Rename some failed causes"" am: e3cc2e6c98
am: 90e2f900ca

Change-Id: I1b951e3b00983a364b4eef8edb6e5c1d032a3b43
2019-03-19 07:55:22 -07:00
Paul Hu
90e2f900ca Merge "Revert "Rename some failed causes""
am: e3cc2e6c98

Change-Id: I29efdbba830f08ca1a0c01058fce719c8b501dbe
2019-03-19 07:46:17 -07:00
Treehugger Robot
e3cc2e6c98 Merge "Revert "Rename some failed causes"" 2019-03-19 14:31:34 +00:00
TreeHugger Robot
0a96038c85 Merge changes I7bf9bde4,I8d655d1c,Ibc59aa36
* changes:
  Adds class and method documentation in all app prediction classes
  Link Intent.EXTRA_SHORTCUT_ID to ACTION_SEND Intent
  Change ShortcutInfo.Builder.setLongLived to take a boolean
2019-03-19 14:22:28 +00:00
Remi NGUYEN VAN
2eddac418e Merge "Fix API for SocketUtils" am: 4a66729cfe am: 55d7bc0106
am: e35cba5262

Change-Id: I91b741adfade7a8d3271ffa8792e290ad07a2f00
2019-03-19 01:39:37 -07:00
Remi NGUYEN VAN
e35cba5262 Merge "Fix API for SocketUtils" am: 4a66729cfe
am: 55d7bc0106

Change-Id: I81f59494241c5806c7c58422b6ab7d0be2cdd3a4
2019-03-19 01:30:11 -07:00
Remi NGUYEN VAN
55d7bc0106 Merge "Fix API for SocketUtils"
am: 4a66729cfe

Change-Id: I2340b528ab7a1a628e257205603d0d902f7cccd0
2019-03-19 01:21:20 -07:00
Remi NGUYEN VAN
4a66729cfe Merge "Fix API for SocketUtils" 2019-03-19 08:08:50 +00:00
Luke Huang
65090523ce Merge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc am: 7d249575a1
am: e640b70ee8

Change-Id: Ia2305094fe66017fbdfdc18b2c7284452ac90036
2019-03-18 23:40:49 -07:00
Luke Huang
e640b70ee8 Merge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc
am: 7d249575a1

Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146
2019-03-18 23:25:58 -07:00
Luke Huang
f004c56618 Merge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642 am: 9a4c839725
am: 6e2648a7bc

Change-Id: Id4d0ae87b1ac8618c28da666619c5c5b5bd2d722
2019-03-18 23:24:06 -07:00
Luke Huang
6e2648a7bc Merge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642
am: 9a4c839725

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a
2019-03-18 23:09:58 -07:00
Luke Huang
7d249575a1 Merge "Replace Handler with Executor for async DNS API"
am: 2656b3d4cc

Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745
2019-03-18 23:05:15 -07:00
Luke Huang
9a4c839725 Merge "Refactor answer callback for async DNS query JAVA API"
am: f1d0fd2642

Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f
2019-03-18 22:55:37 -07:00
Luke Huang
2656b3d4cc Merge "Replace Handler with Executor for async DNS API" 2019-03-19 05:35:39 +00:00
Luke Huang
f1d0fd2642 Merge "Refactor answer callback for async DNS query JAVA API" 2019-03-19 05:35:18 +00:00
Mark Chien
58f6df7123 Merge "Remove deprecated entitlement API" am: 36459170a7 am: 6f86953a39
am: d9fbd454de

Change-Id: I6bb5611de8d45e9a5c17128ea38ba1bdd8f86ac2
2019-03-18 20:38:36 -07:00
Chen Xu
20306b0038 Merge "add two more parameters to carrier id TestAPI" 2019-03-19 03:32:03 +00:00
Lorenzo Colitti
03f50c1aa5 Merge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17e277
am: ea7b1b7bb9

Change-Id: I0cc600177432f11c7d7dab39478336ed9b7409d7
2019-03-18 20:23:30 -07:00
Mark Chien
d9fbd454de Merge "Remove deprecated entitlement API" am: 36459170a7
am: 6f86953a39

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3
2019-03-18 20:22:09 -07:00
Paul Hu
f5e0242249 Revert "Rename some failed causes"
This reverts commit 1c405b73b0.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I4af7c87d8a8a988c2f1c3dc6662027c6fcd34088
2019-03-19 03:11:31 +00:00
Lorenzo Colitti
ea7b1b7bb9 Merge "Address API review comments for VPN changes." am: bbfee2b427
am: 071c17e277

Change-Id: I0c76f4ac181a49f57486b16de2f98f27c60b2a44
2019-03-18 20:08:29 -07:00
Mark Chien
6f86953a39 Merge "Remove deprecated entitlement API"
am: 36459170a7

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
2019-03-18 20:00:35 -07:00
Mark Chien
36459170a7 Merge "Remove deprecated entitlement API" 2019-03-19 02:44:37 +00:00
Lorenzo Colitti
071c17e277 Merge "Address API review comments for VPN changes."
am: bbfee2b427

Change-Id: I79d035244faeef373751e256f49075d1f2a10faf
2019-03-18 19:34:28 -07:00
Lorenzo Colitti
bbfee2b427 Merge "Address API review comments for VPN changes." 2019-03-19 02:16:58 +00:00
Brad Ebinger
4e7abb98d1 Merge "Emergency API review" am: 853983ef32
am: c6d673901a

Change-Id: I7d869f5e3ef5b98fb52a429687b4a0875baa835d
2019-03-18 17:29:04 -07:00
Soonil Nagarkar
ab0b329789 Merge "Revert API removal" 2019-03-19 00:23:03 +00:00
Brad Ebinger
c6d673901a Merge "Emergency API review"
am: 853983ef32

Change-Id: Idcfa450fba2e08d825bbe2b95094a7e7f070421b
2019-03-18 16:50:54 -07:00
TreeHugger Robot
01e63ea5fd Merge "Camera: Update "RecommendedStreamConfigurationMap" annotations" 2019-03-18 23:42:53 +00:00
Brad Ebinger
853983ef32 Merge "Emergency API review" 2019-03-18 23:29:34 +00:00
Tyler Gunn
35fd7c906e Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2 am: 55c3b4a993
am: 0e79151f2d

Change-Id: Ia4380a4d25dd88243f123eb48b36bd3d94cfbb32
2019-03-18 16:06:46 -07:00
Tyler Gunn
0e79151f2d Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2
am: 55c3b4a993

Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e
2019-03-18 15:58:21 -07:00
Jean-Michel Trivi
90682ff7c5 New intent action for speakerphone state change
New intent action ACTION_SPEAKERPHONE_STATE_CHANGED to indicate
  speakerphone state changed.

Bug: 74541410
Test: m -j ; make -j api-stubs-docs-update-current-api ; m -j ; atest android.media.cts.AudioManagerTest#testSpeakerphoneIntent
Change-Id: I01963493001e31b1edf1f1ba85b5744eb924d887
2019-03-18 15:52:00 -07:00
Tyler Gunn
55c3b4a993 Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated."
am: e2a486a7b2

Change-Id: Ib0d700c29e28166081b81cbdaeb8ad278d7ca21c
2019-03-18 15:46:56 -07:00
Tyler Gunn
e2a486a7b2 Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." 2019-03-18 22:18:52 +00:00
sqian
3b5f87f965 Emergency API review
1) Remove 'current' in Emergency APIs
2) Remove nullable
3) Handled the null Telephony service case
4) Hide getEmergencyServiceCategoryBitmask
5) Make getEmergencyUrns unmodifiable

Test: Treehugger
Bug: 122368381
Bug: 126699022
Bug: 126701211
Merged-In: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
Change-Id: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
2019-03-18 15:18:00 -07:00
TreeHugger Robot
40e9a201db Merge "Camera: Add low latency suggested use case" 2019-03-18 22:02:53 +00:00
Soonil Nagarkar
5678571d4a Merge "Add PROVIDERS_CHANGED_ACTION extra for provider" 2019-03-18 21:45:44 +00:00
Jordan Liu
dc0ac4fa83 Merge "Add slot based ICC channel APIs" am: e278d2bcdd
am: ca075c3176

Change-Id: Ia43d743a06f21a812f74f98541e618f627dcf4a7
2019-03-18 13:56:12 -07:00
Soonil Nagarkar
09a3ce7c44 Revert API removal
Bug: 128842115
Test: manual
Change-Id: Iff8e1a1c4c9dd6d089d0af6527bdd74ee38fa421
2019-03-18 13:53:33 -07:00
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
TreeHugger Robot
4687d70d9d Merge "Hide MeasuredText.getChars" 2019-03-18 19:38:18 +00:00
Usman Abdullah
3783c597bf Merge "Add silence support to CallScreeningService/Call API" 2019-03-18 19:33:33 +00:00
Soonil Nagarkar
3126c90786 Add PROVIDERS_CHANGED_ACTION extra for provider
Give clients a way to know which providers have changed state, useful
since LOCATION_PROVIDERS_ALLOWED will be removed in the future.

Bug: 127372321
Test: manual
Change-Id: I16c0acbaad97930bea23084b50193582cc918fa2
2019-03-18 12:00:44 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
Jack Yu
04b8032de5 Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" 2019-03-18 17:28:08 +00:00
Seigo Nonaka
67e8cb2bfc Hide MeasuredText.getChars
The MeasuredText.getChars is used only from text layout internals:
- LineBreaker#computeLineBreaks
- Canvas.drawtextRun

Thus, no need to be exposed to public. Making it @hide

Change-Id: I7c27a4b95d7d5ebc2ad5d74c947cdea3ce08f2ab
Fix: 124795470
Test: N/A
2019-03-18 10:13:27 -07:00