Mark Chien
0e8bcbfebd
Merge "Upstream Configuration should also consider automatic configuration" am: fad9571dc5
...
am: 3effe3a715
2018-12-11 00:50:08 -08:00
Mark Chien
3effe3a715
Merge "Upstream Configuration should also consider automatic configuration"
...
am: fad9571dc5
2018-12-11 00:23:36 -08:00
Mark Chien
fad9571dc5
Merge "Upstream Configuration should also consider automatic configuration"
2018-12-11 04:27:43 +00:00
Hall Liu
3b74db277d
Merge changes from topic "acct-suggestion-1" am: f3935f0268
...
am: 5da9fe3d79
2018-12-10 19:06:06 -08:00
Selim Cinek
3050cc66d1
Merge "Fixed the inline launch animation for notification groups" into pi-dev
...
am: 047b8def3f
2018-12-10 19:02:46 -08:00
Hall Liu
5da9fe3d79
Merge changes from topic "acct-suggestion-1"
...
am: f3935f0268
2018-12-10 18:54:12 -08:00
Pengquan Meng
cd9df483d4
Merge "Modify constructor of NetworkRegistrationState" am: 61c09d128b
...
am: 070ab3d85e
2018-12-10 18:53:41 -08:00
TreeHugger Robot
047b8def3f
Merge "Fixed the inline launch animation for notification groups" into pi-dev
2018-12-11 02:46:38 +00:00
Pengquan Meng
070ab3d85e
Merge "Modify constructor of NetworkRegistrationState"
...
am: 61c09d128b
2018-12-10 18:44:11 -08:00
Hall Liu
f3935f0268
Merge changes from topic "acct-suggestion-1"
...
* changes:
Add docs and more annotations
Add PhoneAccountSuggestion class
2018-12-11 02:43:16 +00:00
Hall Liu
34d9e24008
Add docs and more annotations
...
Add docs to some constants in PhoneAccountSuggestion and add @TestApi
annotations to enable CTS testing for the new APIs.
Test: compiles
Bug: 111455117
Change-Id: I2b55a411ff4f0da37eefa0996f7316ea53bca41d
2018-12-10 18:41:01 -08:00
Pengquan Meng
61c09d128b
Merge "Modify constructor of NetworkRegistrationState"
2018-12-11 02:26:19 +00:00
Jordan Liu
ec098703ef
Merge "Return "" not "null"" am: eebbd2b639
...
am: edaf4401e1
2018-12-10 17:44:53 -08:00
Jordan Liu
edaf4401e1
Merge "Return "" not "null""
...
am: eebbd2b639
2018-12-10 17:34:26 -08:00
Kyeongkab.Nam
f7e816f6a2
Merge "Fix to set physical address for IsConnectedToArcPort" am: 5db6efa36d
...
am: 6c6286f50d
2018-12-10 17:26:40 -08:00
Xiangyu/Malcolm Chen
fe09b5f332
Merge "Deactivate bundled opportunistic subscription." am: 69a618fb5b
...
am: 906dd13d0d
2018-12-10 17:16:42 -08:00
Kyeongkab.Nam
6c6286f50d
Merge "Fix to set physical address for IsConnectedToArcPort"
...
am: 5db6efa36d
2018-12-10 17:15:10 -08:00
Jordan Liu
eebbd2b639
Merge "Return "" not "null""
2018-12-11 01:12:38 +00:00
Xiangyu/Malcolm Chen
906dd13d0d
Merge "Deactivate bundled opportunistic subscription."
...
am: 69a618fb5b
2018-12-10 17:07:19 -08:00
Treehugger Robot
5db6efa36d
Merge "Fix to set physical address for IsConnectedToArcPort"
2018-12-11 01:01:20 +00:00
Xiangyu/Malcolm Chen
69a618fb5b
Merge "Deactivate bundled opportunistic subscription."
2018-12-11 00:42:34 +00:00
robinz1x
886c64d1e3
Merge "Use getCompressedSizeLong to get correct size for 2G file" am: ee1720cffa
...
am: d3ffd42b19
2018-12-10 15:53:27 -08:00
robinz1x
d3ffd42b19
Merge "Use getCompressedSizeLong to get correct size for 2G file"
...
am: ee1720cffa
2018-12-10 15:37:30 -08:00
Pengquan Meng
73596cb5e9
Modify constructor of NetworkRegistrationState
...
This change the data specific constructor of NetworkRegistrationState to
make it adapt to the new NR indicators.
Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: I4e1f30ea8531a6a424c2c920c74257d4d673589d
Change-Id: I4e1f30ea8531a6a424c2c920c74257d4d673589d
2018-12-10 15:36:52 -08:00
Treehugger Robot
ee1720cffa
Merge "Use getCompressedSizeLong to get correct size for 2G file"
2018-12-10 22:47:00 +00:00
Pengquan Meng
41c1d31677
Merge "Add 5G rat type" am: 8f9f382c9c
...
am: 411ea19296
2018-12-10 14:30:58 -08:00
Pengquan Meng
411ea19296
Merge "Add 5G rat type"
...
am: 8f9f382c9c
2018-12-10 14:18:49 -08:00
Malcolm Chen
d86d02a281
Deactivate bundled opportunistic subscription.
...
When primary subscription is disabled, also deactivate
its bundled opportunistic subscription.
Bug: 118349116
Test: unittest
Change-Id: I04cb89b8cc2d03836878866d2975af186de42468
Merged-In: I04cb89b8cc2d03836878866d2975af186de42468
2018-12-10 14:02:58 -08:00
Pengquan Meng
8f9f382c9c
Merge "Add 5G rat type"
2018-12-10 22:00:35 +00:00
Jordan Liu
5b7f382bb5
Merge "Add new key for carrier configuration version" am: 06dcff96e4
...
am: a39793b22f
2018-12-10 12:54:57 -08:00
Jordan Liu
a39793b22f
Merge "Add new key for carrier configuration version"
...
am: 06dcff96e4
2018-12-10 12:44:48 -08:00
Jordan Liu
06dcff96e4
Merge "Add new key for carrier configuration version"
2018-12-10 20:23:09 +00:00
Adrian Roos
b2d80c1acc
Merge "hiddenapi-mappings: Hide ReferencesHidden errors" am: 3cfdb94845
...
am: f1f26e1165
2018-12-10 09:28:20 -08:00
Adrian Roos
f1f26e1165
Merge "hiddenapi-mappings: Hide ReferencesHidden errors"
...
am: 3cfdb94845
2018-12-10 09:18:23 -08:00
Treehugger Robot
3cfdb94845
Merge "hiddenapi-mappings: Hide ReferencesHidden errors"
2018-12-10 17:02:25 +00:00
Ivan Chiang
ba104e77e4
Merge "Expose Uri toSafeString api" am: 17f9b9bfb6
...
am: 1be68938eb
2018-12-10 07:13:02 -08:00
Ivan Chiang
1be68938eb
Merge "Expose Uri toSafeString api"
...
am: 17f9b9bfb6
2018-12-10 07:00:06 -08:00
Ivan Chiang
17f9b9bfb6
Merge "Expose Uri toSafeString api"
2018-12-10 14:32:36 +00:00
markchien
1be8d8fc9c
Upstream Configuration should also consider automatic configuration
...
Tethering already support two type upstream configurations,
but hasTetherableConfiguration() only check legacy one.
Bug: 120533392
Test: -runtest frameworks-net
-build, flash, booted
Change-Id: I986070fc009abcad17994b73858962f776b4c3f5
2018-12-10 13:24:05 +00:00
Junyu Lai
c92749ad72
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 0882543a12
...
am: 9867b60f39
2018-12-09 21:46:07 -08:00
Junyu Lai
9867b60f39
Merge "Refactoring of deleting stats in NetworkStats based on uids."
...
am: 0882543a12
2018-12-09 21:38:59 -08:00
Junyu Lai
0882543a12
Merge "Refactoring of deleting stats in NetworkStats based on uids."
2018-12-10 05:15:28 +00:00
Luke Huang
c2126e2008
Merge "Migrate INetd to stable aidl" am: 9677dde14a
...
am: ef6b675a8c
2018-12-09 19:27:33 -08:00
Luke Huang
ef6b675a8c
Merge "Migrate INetd to stable aidl"
...
am: 9677dde14a
2018-12-09 19:18:57 -08:00
Luke Huang
9677dde14a
Merge "Migrate INetd to stable aidl"
2018-12-10 03:07:08 +00:00
Bill Lin
5709582a94
Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev
...
am: f147660c1e
2018-12-09 18:14:56 -08:00
Bill Lin
f147660c1e
Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev
2018-12-10 01:52:36 +00:00
Orion Hodson
2e09a6b61a
Merge "Remove ScopedBytes use" am: 422fa22456
...
am: 7c58021208
2018-12-09 12:16:36 -08:00
Orion Hodson
7c58021208
Merge "Remove ScopedBytes use"
...
am: 422fa22456
2018-12-09 12:09:15 -08:00
Treehugger Robot
422fa22456
Merge "Remove ScopedBytes use"
2018-12-09 19:36:28 +00:00
