OSDN Git Service
Android Build Merger (Role) [Fri, 2 Feb 2018 07:10:46 +0000 (07:10 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6 am:
389f0e5240 am:
f7b4200a5f
am:
87b7b02220
Change-Id: I3b081bf2861d84979060c8cf6d464462bdf20b9b
Adam Vartanian [Fri, 2 Feb 2018 07:05:29 +0000 (07:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev am:
36c202ed80 am:
cf31e066a9
am:
f64dcd5bb5
Change-Id: I5980a614656d41f648da5a57c933533705a89c63
Hall Liu [Fri, 2 Feb 2018 04:37:13 +0000 (04:37 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
871202da2f
am:
cf59665a75
Change-Id: I8eee8b62f0e41fa7346126d29266dfd555550028
Tyler Gunn [Fri, 2 Feb 2018 04:32:32 +0000 (04:32 +0000)]
Merge "Add call recording tone support." am:
8d5b08c430
am:
eb74233ff9
Change-Id: I1111bc80ec7dff95e6e1a5f53da22d5e65042060
Jordan Liu [Fri, 2 Feb 2018 04:27:27 +0000 (04:27 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings" am:
2aa0cdd1d2
am:
ba0581bcf1
Change-Id: If09ae852661ab154804ad9f30a2eea0839f291c0
Alex Khlivnuik [Fri, 2 Feb 2018 04:18:38 +0000 (04:18 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am:
0be23629a8
am:
c9cfb504f7
Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55
nharold [Fri, 2 Feb 2018 04:14:20 +0000 (04:14 +0000)]
Merge "CellSignalStrength cleanup" am:
af7435ca1f
am:
67a2db0a66
Change-Id: Ib405d3d8d2bc723dbddfaca4748bb34fcbae877a
Jack Yu [Fri, 2 Feb 2018 04:10:23 +0000 (04:10 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API" am:
a02d09a449
am:
8208b2ef2e
Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9
Brad Ebinger [Fri, 2 Feb 2018 04:03:45 +0000 (04:03 +0000)]
Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp" am:
d6d9ff3c2d
am:
2390485616
Change-Id: I65687184fd12088804a905518b3613b2444be7eb
Android Build Merger (Role) [Fri, 2 Feb 2018 03:49:25 +0000 (03:49 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6 am:
389f0e5240
am:
f7b4200a5f
Change-Id: Id222c2407af4807631e3d2d588fff3c67d00d3c0
Adam Vartanian [Fri, 2 Feb 2018 03:46:04 +0000 (03:46 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev am:
36c202ed80
am:
cf31e066a9
Change-Id: I774ce7a4046548222c3a0d913bbfcc3e0759ede3
Hall Liu [Fri, 2 Feb 2018 03:42:38 +0000 (03:42 +0000)]
Merge "Check for location access on TelephonyRegistry"
am:
871202da2f
Change-Id: Ibe61ae68be0b451e0ac135b1e68d1c687586887c
Tyler Gunn [Fri, 2 Feb 2018 00:24:39 +0000 (00:24 +0000)]
Merge "Add call recording tone support."
am:
8d5b08c430
Change-Id: Ie99332c73bed7681e05a2e7603da2c5c573a95f3
Jordan Liu [Fri, 2 Feb 2018 00:19:19 +0000 (00:19 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings"
am:
2aa0cdd1d2
Change-Id: Id5dfe845419d4b084decb6dab04f1e701068c4d4
Alex Khlivnuik [Fri, 2 Feb 2018 00:08:21 +0000 (00:08 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls"
am:
0be23629a8
Change-Id: I122612a24a1908700bceb790f2309aebb15bed09
nharold [Fri, 2 Feb 2018 00:04:04 +0000 (00:04 +0000)]
Merge "CellSignalStrength cleanup"
am:
af7435ca1f
Change-Id: I90cffed716a7bf830862b396597a97d1233e9afd
Jack Yu [Thu, 1 Feb 2018 23:54:10 +0000 (23:54 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API"
am:
a02d09a449
Change-Id: I8c49b9296e863244bf49ff806d319b2e1be326be
Android Build Merger (Role) [Thu, 1 Feb 2018 23:50:39 +0000 (23:50 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
am:
389f0e5240
Change-Id: I127c7f52e2adc246784f750a4ccb1f494bbdb245
Adam Vartanian [Thu, 1 Feb 2018 23:44:18 +0000 (23:44 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
am:
36c202ed80
Change-Id: Ieb4b5cd2cafd20d4898bc781c43e41d3bed0d7dc
Brad Ebinger [Thu, 1 Feb 2018 23:40:17 +0000 (23:40 +0000)]
Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp"
am:
d6d9ff3c2d
Change-Id: I5575ec7a2a1cba12815a118106133806977219de
Hall Liu [Thu, 1 Feb 2018 23:05:22 +0000 (23:05 +0000)]
Merge "Check for location access on TelephonyRegistry"
Tyler Gunn [Thu, 1 Feb 2018 22:38:55 +0000 (22:38 +0000)]
Merge "Add call recording tone support."
Jordan Liu [Thu, 1 Feb 2018 22:35:38 +0000 (22:35 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings"
Treehugger Robot [Thu, 1 Feb 2018 21:18:53 +0000 (21:18 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls"
nharold [Thu, 1 Feb 2018 21:03:55 +0000 (21:03 +0000)]
Merge "CellSignalStrength cleanup"
Treehugger Robot [Thu, 1 Feb 2018 20:10:36 +0000 (20:10 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API"
David Srbecky [Thu, 1 Feb 2018 19:25:40 +0000 (19:25 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am:
ddd440b8a2
am:
8df431a8ef
Change-Id: Ib2c08bb7bcf5d85c15db9ec16eca1ae9c7930eb6
David Srbecky [Thu, 1 Feb 2018 17:17:42 +0000 (17:17 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
am:
ddd440b8a2
Change-Id: Ic6bb0ab7eeaee99b625f035d0745df00f701c9c5
Brad Ebinger [Thu, 1 Feb 2018 16:38:36 +0000 (16:38 +0000)]
Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp"
* changes:
Add and trigger onReady API for SMS over IMS.
Unhide SMS over IMS APIs
Remove internal version of SMS apis
Move Sms API to proper MMTelFeature class
Add unique id for sms APIs to be able to trigger correct smstracker
David Srbecky [Thu, 1 Feb 2018 15:31:05 +0000 (15:31 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:57 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
Change-Id: Ibf20bf72eaea7cbf173e52bf8f57d81fd292a194
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:52 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5
Change-Id: I3cf57dd4a6bf94731b963602b84af31913de743d
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:46 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8
Change-Id: I63980272300f26d8ded0154fc3fb4886cb6df17e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:40 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd
Change-Id: I506e5707bb4eb541740909d36679691f0fd8caf9
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:34 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85
Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:20 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786
Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f
Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac
Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
am:
fea4158eea
Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f
Jack Yu [Wed, 31 Jan 2018 08:33:20 +0000 (00:33 -0800)]
Added support for the new 1.2 data setup/deactivate API
Added support for the 1.2 IRadio APIs that support IWLAN handover.
Test: Telephony sanity tests
Bug:
64132030
Merged-In: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
(cherry picked from commit
08063d6c1bb64d2b65fe08bfc04d00f3f0fc856f)
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr2-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr1.5-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-f-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-e-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Android Build Merger (Role) [Thu, 1 Feb 2018 04:00:02 +0000 (04:00 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6 am:
542f647684 am:
687a6d23c5
am:
fee7f53322
Change-Id: I92187dc7dd55b3fe5904f1d6829940a1296cb538
Android Build Merger (Role) [Thu, 1 Feb 2018 03:54:39 +0000 (03:54 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev am:
82db4c8b41 am:
4205b8a166 am:
723efe6935
am:
7131d4b415
Change-Id: I65b5bae4f58f49a5786b5f587139e60c4122a26f
Benedict Wong [Thu, 1 Feb 2018 03:49:45 +0000 (03:49 +0000)]
Merge "Fix minor bugs with tunnel mode implementation" am:
cb9cd96c50
am:
b7afa3f6fb
Change-Id: I9c2a844d9ccc401a34d0e6318506406e8c33fab6
Android Build Merger (Role) [Thu, 1 Feb 2018 03:38:06 +0000 (03:38 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6 am:
542f647684
am:
687a6d23c5
Change-Id: Ia5ab8296347a9698cf2e18b80366698db40d438e
Android Build Merger (Role) [Thu, 1 Feb 2018 03:36:16 +0000 (03:36 +0000)]
Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am:
3b50dc3d34 am:
98568f57ad" into oc-mr1-dev-plus-aosp
Alex Light [Thu, 1 Feb 2018 03:35:32 +0000 (03:35 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am:
3b50dc3d34
am:
98568f57ad
Change-Id: Iaecbcf1bf3d948163c2d06261577f63884206edb
Android Build Merger (Role) [Thu, 1 Feb 2018 03:35:27 +0000 (03:35 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev am:
46fc48f57e am:
b39e49d52c
am:
1c4ccab92b
Change-Id: I32ba85cdc40ea77772361ffb399085f7b8a67416
Benedict Wong [Thu, 1 Feb 2018 03:30:44 +0000 (03:30 +0000)]
Merge "Fix minor bugs with tunnel mode implementation"
am:
cb9cd96c50
Change-Id: I94210f595e904d13711feb97e77a3373d8cce1b0
Android Build Merger (Role) [Thu, 1 Feb 2018 03:30:15 +0000 (03:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev am:
82db4c8b41 am:
4205b8a166
am:
723efe6935
Change-Id: Ic264904353cf9e3b184b32fc33d0d3479ad65f4e
Android Build Merger (Role) [Thu, 1 Feb 2018 03:24:13 +0000 (03:24 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev am:
46fc48f57e
am:
b39e49d52c
Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4
Alex Light [Thu, 1 Feb 2018 03:23:23 +0000 (03:23 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."""
am:
3b50dc3d34
Change-Id: Ie10dab211f77420b1f38833e6aa718365c37ea9a
Android Build Merger (Role) [Thu, 1 Feb 2018 03:20:23 +0000 (03:20 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6
am:
542f647684
Change-Id: I4ca0c56badef09ee37e130f3183bd8f27b9e5947
Android Build Merger (Role) [Thu, 1 Feb 2018 03:18:27 +0000 (03:18 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev am:
82db4c8b41
am:
4205b8a166
Change-Id: Ic1f9b793f7a5836bdf7e6f3520d3ad7e90732141
Android Build Merger (Role) [Thu, 1 Feb 2018 03:13:16 +0000 (03:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
am:
46fc48f57e
Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa
Hall Liu [Thu, 23 Nov 2017 01:38:15 +0000 (17:38 -0800)]
Check for location access on TelephonyRegistry
When sending outbound callbacks on CELL_INFO and CELL_LOCATION, check to
make sure that the user has authorized us and the receiving app to get
information on their location.
Bug:
69637693
Test: manual: telephony testapp
Change-Id: Ib4c8c6a9765f504823016e538dd46768d1032792
Mohamed Abdalkader [Tue, 23 Jan 2018 21:09:00 +0000 (13:09 -0800)]
Add and trigger onReady API for SMS over IMS.
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=
69846044
Merged-In: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
Benedict Wong [Wed, 31 Jan 2018 22:45:26 +0000 (22:45 +0000)]
Merge "Fix minor bugs with tunnel mode implementation"
Android Build Merger (Role) [Wed, 31 Jan 2018 22:31:31 +0000 (22:31 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6
Change-Id: I22952487835512925c3a2fe5ca2086f6b5354844
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:46 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
am:
82db4c8b41
Change-Id: I5c35701ddf6633063cad9ca141856b8612f7ad9b
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:44 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
am:
afb1b1aeb6
Change-Id: I4d2f501b942e2a7dd6c2a3415758ce76087f1b78
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9 am:
5786491706
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
Shuzhen Wang [Wed, 31 Jan 2018 22:07:48 +0000 (22:07 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am:
5f7cdba8ab am:
df255a4a6b
am:
152acb5162
Change-Id: I744ced5fe3d6ad25c4aaf8deb438286ba5803480
Jakub Pawlowski [Wed, 31 Jan 2018 22:01:05 +0000 (22:01 +0000)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
am:
5332988c62 -s ours
Change-Id: Iae5d111fd984a3dbe57ed8ca5427a5082ace9def
Shuzhen Wang [Wed, 31 Jan 2018 21:49:57 +0000 (21:49 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am:
5f7cdba8ab
am:
df255a4a6b
Change-Id: I273a04bfcab3b26da4bc745445d144db1a0c9419
Shuzhen Wang [Wed, 31 Jan 2018 21:28:00 +0000 (21:28 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
am:
5f7cdba8ab
Change-Id: Ic55969e029228542f79e870cb7b5c68602b9a084
Mohamed Abdalkader [Tue, 23 Jan 2018 17:56:31 +0000 (09:56 -0800)]
Unhide SMS over IMS APIs
While here add more constants for send sms result.
Test: manual
BUG:
69846044
Merged-In: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
Change-Id: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
TreeHugger Robot [Wed, 31 Jan 2018 21:11:32 +0000 (21:11 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
Nathan Harold [Tue, 30 Jan 2018 03:05:29 +0000 (19:05 -0800)]
CellSignalStrength cleanup
Remove a few duplicated initialization methods
in the CellSignalStrength classes. They were
either not being used or were trivially refactored
in to their respective constructors.
Bug:
72742517
Test: compilation
Change-Id: I7115eace62dc0b6d59ea25deedaf5a0d0f270496
Treehugger Robot [Wed, 31 Jan 2018 20:17:19 +0000 (20:17 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."""
Mohamed Abdalkader [Mon, 22 Jan 2018 23:43:37 +0000 (15:43 -0800)]
Remove internal version of SMS apis
Test: manual
BUG=
69846044
Merged-In: Ie084ea67c460c686bd587e4b36f8c1579517ea7f
Change-Id: Ie084ea67c460c686bd587e4b36f8c1579517ea7f
David Brazdil [Wed, 31 Jan 2018 19:45:39 +0000 (19:45 +0000)]
Merge "Show hidden API warning once per process" am:
880839d2d1
am:
169a159207
Change-Id: I11b174f82b8a71884de6b384f9478d125ce45ab4
David Brazdil [Wed, 31 Jan 2018 19:39:30 +0000 (19:39 +0000)]
Merge "Show hidden API warning once per process"
am:
880839d2d1
Change-Id: I2da706085d0ee0cb047b6b5c516c8a91487b77eb
Mohamed Abdalkader [Sat, 13 Jan 2018 00:37:08 +0000 (16:37 -0800)]
Move Sms API to proper MMTelFeature class
- while here remove unnecessary call to ackSms from
SmsImplBase as this is handled by ImsSmsDispatcher
Test: None, APIs not exercised yet.
BUG=
69846044
Merged-In: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
Change-Id: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
Mohamed Abdalkader [Fri, 12 Jan 2018 19:52:31 +0000 (11:52 -0800)]
Add unique id for sms APIs to be able to trigger correct smstracker
In old APIs the SmsTracker itself was being passed to the RIL
and onSendComplete the tracker's pending intent was triggered
and then the updated messageRef was used as the id.
Instead of passing the tracker, passing a unique id to be used
for the lifetime of the message.
Doing same thing for receiving flow.
Test: None, APIs not exercised yet.
BUG=
69846044
Merged-In: Id19f854e2c48649db8f2031ee4f49cdac331451c
Change-Id: Id19f854e2c48649db8f2031ee4f49cdac331451c
Hans Boehm [Wed, 31 Jan 2018 18:49:44 +0000 (18:49 +0000)]
Merge "Add reachabilityFence, remove ExemptionMechanism.finalize" am:
9a9e22fad4
am:
7940256a91
Change-Id: I6b12657a105f215085e5ba7d76f8669e4c48b1ce
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Hans Boehm [Wed, 31 Jan 2018 18:42:51 +0000 (18:42 +0000)]
Merge "Add reachabilityFence, remove ExemptionMechanism.finalize"
am:
9a9e22fad4
Change-Id: I7d78410e9dcbb6f7e45950387931d380935cdff3
David Brazdil [Wed, 31 Jan 2018 18:35:00 +0000 (18:35 +0000)]
Merge "Show hidden API warning once per process"
Hans Boehm [Wed, 31 Jan 2018 18:20:05 +0000 (18:20 +0000)]
Merge "Add reachabilityFence, remove ExemptionMechanism.finalize"
Alex Light [Wed, 31 Jan 2018 16:47:29 +0000 (16:47 +0000)]
Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""
This reverts commit
ff5d60b268dfd848c236b62ae241370a68aae39f.
Reason for revert: Fixed issue breaking go/art-build.
Bug:
72400560
Test: Build
Change-Id: Ie8943068302bec02d149917ccf738c0d935f8fe0
David Brazdil [Wed, 31 Jan 2018 13:27:56 +0000 (13:27 +0000)]
Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."" am:
b3cef78e8d
am:
e49f4ef9fa
Change-Id: Iea3ba9377f0a4cc5a6056e6a6116206d95a19d66
David Brazdil [Wed, 31 Jan 2018 13:20:42 +0000 (13:20 +0000)]
Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""
am:
b3cef78e8d
Change-Id: I489a9ed838033ba72a62fb6241093b89b3fb54b2
hansson [Wed, 31 Jan 2018 11:35:55 +0000 (11:35 +0000)]
Merge "Fix "zygote is killed by signal 1"" am:
2372af9cd8
am:
476b746360
Change-Id: Icc8e058d80cb616d80b37976c8413a4ed32cd4a7
hansson [Wed, 31 Jan 2018 11:28:54 +0000 (11:28 +0000)]
Merge "Fix "zygote is killed by signal 1""
am:
2372af9cd8
Change-Id: I3cad05514edcc122b4b523d08d39bcfc164e8a86
David Brazdil [Wed, 31 Jan 2018 11:24:15 +0000 (11:24 +0000)]
Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:07 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
Change-Id: Iceaaaec271c590da862e65002396222aab9219e8
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:02 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:55 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:48 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:41 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
OSDN Git Service
