Commit Graph

376842 Commits

Author SHA1 Message Date
Bill Yi
76fb088271 [automerger skipped] Import translations. DO NOT MERGE
am: 4361fd1517  -s ours

Change-Id: I543254e2d030e48e02d1d22f67ef01f9d7e73f1c
2018-09-13 02:24:25 -07:00
Evan Tyra
5e8e4fc558 [automerger skipped] Merge "DO NOT MERGE: Added a new carrier config for data connection failed radio restart" into pi-dev
am: c3a74b5c68  -s ours

Change-Id: Idc5f55bb4cdd89860db2fe24516e2206b5c762c3
2018-09-13 02:20:33 -07:00
Erik Kline
b0104bb32e Merge "Remove the last of the ResolvUtil uses" am: e7f1dc6661
am: befac97371

Change-Id: I1c434d72a6bfd9d4076a94813bd7def4468a54b8
2018-09-13 01:14:38 -07:00
Shaotang Li
f9410cafec Merge changes into stage-aosp-master
am: 1a63bcc0a5

Change-Id: I46d9e80464652ac98c7b745686aaa490d57a8ab0
2018-09-13 00:56:38 -07:00
Shaotang Li
e68a635545 Merge changes into stage-aosp-master
am: f35a53afa2

Change-Id: I6fa8268060713303c3d999fec0fd91aa78849872
2018-09-13 00:52:20 -07:00
Shaotang Li
7d14032afe Merge "Add new telecom metrics for emergency dialer" am: 0dcc53fd52
am: 28d138a6aa

Change-Id: I3a870887c924ba2052f9a779e47e23978ee578aa
2018-09-13 00:40:26 -07:00
Erik Kline
befac97371 Merge "Remove the last of the ResolvUtil uses"
am: e7f1dc6661

Change-Id: I5f05b3279278f350bd4491efcdb674189b70d99b
2018-09-13 00:32:19 -07:00
Android Build Merger (Role)
1a63bcc0a5 Merge changes into stage-aosp-master 2018-09-13 07:27:15 +00:00
Android Build Merger (Role)
f35a53afa2 Merge changes into stage-aosp-master 2018-09-13 07:27:15 +00:00
Shaotang Li
28d138a6aa Merge "Add new telecom metrics for emergency dialer"
am: 0dcc53fd52

Change-Id: I0a1537c8dbd6723614869e6bfcd95292ac603872
2018-09-13 00:26:01 -07:00
Treehugger Robot
e7f1dc6661 Merge "Remove the last of the ResolvUtil uses" 2018-09-13 06:39:16 +00:00
Shaotang Li
0dcc53fd52 Merge "Add new telecom metrics for emergency dialer" 2018-09-13 05:59:51 +00:00
Luke Huang
6f517f4708 Merge "Bandwidth-related commands porting" am: 8dc60930ab
am: 160adaab84

Change-Id: I96549ecad3788a7b2c4c18e93dd25b583b8ec580
2018-09-12 21:44:55 -07:00
Chienyuan
3961d1e653 Merge "Simplify logic for connect in HfpClientProfile" am: 57d9052ce8
am: 6b245cdff6

Change-Id: I698880342edde2c6834f8487850cdc580fd8e735
2018-09-12 21:34:09 -07:00
Chienyuan
7f3d615e3a Merge "Simplify logic for connect in A2dpSinkProfile" am: eff45f36cf
am: 731fd3c48c

Change-Id: I403f0271ddf09f70751e511ab0b27c0d900a4976
2018-09-12 21:29:27 -07:00
Luke Huang
160adaab84 Merge "Bandwidth-related commands porting"
am: 8dc60930ab

Change-Id: I5bc27f75e602661bb01302cd99b544d5bc012cf6
2018-09-12 21:27:22 -07:00
Chienyuan
6b245cdff6 Merge "Simplify logic for connect in HfpClientProfile"
am: 57d9052ce8

Change-Id: If8fed65f3e0760c4ba7e16908f3c720eefa60162
2018-09-12 21:23:27 -07:00
Chienyuan
731fd3c48c Merge "Simplify logic for connect in A2dpSinkProfile"
am: eff45f36cf

Change-Id: I78762f35350b9d7ac567e46cd30c728de6782bf3
2018-09-12 21:19:10 -07:00
Luke Huang
8dc60930ab Merge "Bandwidth-related commands porting" 2018-09-13 03:01:22 +00:00
Treehugger Robot
57d9052ce8 Merge "Simplify logic for connect in HfpClientProfile" 2018-09-13 03:00:19 +00:00
Treehugger Robot
eff45f36cf Merge "Simplify logic for connect in A2dpSinkProfile" 2018-09-13 02:58:50 +00:00
Pengquan Meng
f5a303b09e Merge "Add New TelephonyManager APIs" am: b65aca27af
am: 624ccc3331

Change-Id: I5bc79ebfff2f54d10a3dc854f9239e4da38b4312
2018-09-12 19:50:09 -07:00
Pengquan Meng
d9c53abba3 Merge "Add New TelephonyManager APIs"
am: b65aca27af

Change-Id: If2ebccdaa628321e3d158b87f35ea893eecc3e18
2018-09-12 19:44:08 -07:00
Pengquan Meng
731f4bc7f7 Add New TelephonyManager APIs
am: 97c29e04fa

Change-Id: I6be38a8b6337644970541f33d557058466912149
2018-09-12 19:40:04 -07:00
Pengquan Meng
624ccc3331 Merge "Add New TelephonyManager APIs"
am: b65aca27af

Change-Id: I18c7c905f742e40331dca61efc9c314e6b08ad32
2018-09-12 19:32:41 -07:00
Pengquan Meng
b65aca27af Merge "Add New TelephonyManager APIs" 2018-09-13 01:09:47 +00:00
Mårten Kongstad
74eb2835ab Merge "OMS: fix typos in permission check message" am: 57e5e68385
am: ffb4fe7199

Change-Id: I95cbf838a85fb41c886570b9afe8f16947d49b43
2018-09-12 17:38:03 -07:00
Mårten Kongstad
50bec961b3 Merge "ByteBucketArray.h: fix typo" am: b848ce8e20
am: 0bb76346f5

Change-Id: I5d54e2c1563022480f57efde3783617d45ecb6a1
2018-09-12 17:19:04 -07:00
Pengquan Meng
523cf0bbcb Merge "Update TelephonyManager document" am: 14faaf660d
am: eda353bc52

Change-Id: Id78189ec61aff200b4724da46e85bc69e01e95af
2018-09-12 17:13:13 -07:00
Mårten Kongstad
ffb4fe7199 Merge "OMS: fix typos in permission check message"
am: 57e5e68385

Change-Id: Ie0f8f22894769ca2dde50dd4fd73eb448f57ab4c
2018-09-12 17:11:45 -07:00
Mårten Kongstad
0bb76346f5 Merge "ByteBucketArray.h: fix typo"
am: b848ce8e20

Change-Id: I81aff763f5572b6c72e1a845fda518179cf95e15
2018-09-12 16:57:17 -07:00
Pengquan Meng
eda353bc52 Merge "Update TelephonyManager document"
am: 14faaf660d

Change-Id: Ib155f7cde84ea033164c99f8e09d9fe797badae8
2018-09-12 16:53:13 -07:00
Yohei Yukawa
0561f2c570 Merge "Restrict IMM.notifyUserAction() with targetSdkVersion <= P" am: ec52757ecb
am: 81be3fdc66

Change-Id: Ied8670c7902c047ba523094e8374f9f8ad750621
2018-09-12 15:28:06 -07:00
Treehugger Robot
57e5e68385 Merge "OMS: fix typos in permission check message" 2018-09-12 22:26:26 +00:00
Treehugger Robot
b848ce8e20 Merge "ByteBucketArray.h: fix typo" 2018-09-12 22:26:22 +00:00
Benedict Wong
9d3546281a Merge "Use UID as requestID" am: 583f3632e5
am: 6b3afe71fe

Change-Id: I0d9fb770482e72f3b017702ffb7ec144a64462e0
2018-09-12 15:22:39 -07:00
Pengquan Meng
14faaf660d Merge "Update TelephonyManager document" 2018-09-12 22:12:15 +00:00
Nan Zhang
520267b93f Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065
am: b910944852

Change-Id: I41e110dee813021552fee125ddbcbdbaba2d6703
2018-09-12 15:08:04 -07:00
Yohei Yukawa
81be3fdc66 Merge "Restrict IMM.notifyUserAction() with targetSdkVersion <= P"
am: ec52757ecb

Change-Id: Ia35a97362a467b452abf8649d3ac30b61a410560
2018-09-12 14:39:44 -07:00
Benedict Wong
6b3afe71fe Merge "Use UID as requestID"
am: 583f3632e5

Change-Id: Icef3693f5911c8f69076e0990392e28c693cbc22
2018-09-12 14:35:27 -07:00
Nan Zhang
b910944852 Merge "For metalava target, use droidstubs instead of droiddoc"
am: 5eb84c0065

Change-Id: Iae290fe3c3e6eaf4fda9675bd92e73da87ebd668
2018-09-12 13:43:55 -07:00
Yohei Yukawa
97e3fa9e1e Merge "Remove IInputMethodManager.getEnabledInputMethodList() from greylist" am: fe78728e32
am: b8903776dc

Change-Id: I5dfc8435859a9003bb2a680e3b00443997527877
2018-09-12 13:28:11 -07:00
Chih-hung Hsieh
7a84739070 Merge "Use multiple patterns and emails in per-file syntax." am: d3f10fe89c
am: 697a0b6634

Change-Id: Ie36d24fa75121430db5ec9cfd73aec36efd0a706
2018-09-12 13:21:25 -07:00
Tobias Thierer
1943c462cf Merge "Fix typo in android.net.Uri documentation." am: 8dc7e43bad
am: 47fb98e8a4

Change-Id: Ia63097f8ea8c66b0451e69469768b1e04e6d5eee
2018-09-12 13:14:21 -07:00
Yohei Yukawa
b8903776dc Merge "Remove IInputMethodManager.getEnabledInputMethodList() from greylist"
am: fe78728e32

Change-Id: I187161a476204e568dee0732a8570bdbe2e16260
2018-09-12 12:39:28 -07:00
Treehugger Robot
ec52757ecb Merge "Restrict IMM.notifyUserAction() with targetSdkVersion <= P" 2018-09-12 19:04:40 +00:00
Benedict Wong
583f3632e5 Merge "Use UID as requestID" 2018-09-12 18:51:33 +00:00
Chih-hung Hsieh
697a0b6634 Merge "Use multiple patterns and emails in per-file syntax."
am: d3f10fe89c

Change-Id: If9c5cda9043bb21b256ab614133ad8a57c312517
2018-09-12 11:38:48 -07:00
Tobias Thierer
47fb98e8a4 Merge "Fix typo in android.net.Uri documentation."
am: 8dc7e43bad

Change-Id: Ibd56f995c4692db449ca3210da7cb5d6bcb5c5d3
2018-09-12 11:34:31 -07:00
Nan Zhang
5eb84c0065 Merge "For metalava target, use droidstubs instead of droiddoc" 2018-09-12 18:15:11 +00:00