Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
432,459 Commits 3 Branches 0 Tags
b4dfa6e2fbfcfe5ea534f925dd3df2832aaba761
Commit Graph

432459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
b4dfa6e2fb Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 
am: ec6047ad09

Change-Id: I1bf8d42a2e7874ceb6503f50fb873e59fefdf713
 2019-10-15 23:41:21 -07:00
Tyler Gunn
ec6047ad09 Merge "Add ITelephony setCepEnabled command line command." 
am: ae48da3c55

Change-Id: Ib532a5c16c29596131a6fbeb695fc2a7d59dd81b
 2019-10-15 23:29:29 -07:00
Treehugger Robot
ae48da3c55 Merge "Add ITelephony setCepEnabled command line command." 2019-10-16 06:13:47 +00:00
Nick Desaulniers
d171f486f6 Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55 
am: 0b6b756f3d

Change-Id: I2f28cd59087aff7726c1dab79ceaeb15e5edd6c9
 2019-10-15 21:48:15 -07:00
Lucas Lin
eb9542bdd7 Merge "Remove the network capabilities which are added twice" am: 931234b451 
am: 4c90111d11

Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
 2019-10-15 21:41:47 -07:00
Nick Desaulniers
0b6b756f3d Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" 
am: f7cf0dfa55

Change-Id: I8e7398797b53eab6efdebf7b5e83f6573ee5f83c
 2019-10-15 21:30:43 -07:00
Lucas Lin
4c90111d11 Merge "Remove the network capabilities which are added twice" 
am: 931234b451

Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
 2019-10-15 21:23:48 -07:00
Treehugger Robot
f7cf0dfa55 Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" 2019-10-16 03:48:23 +00:00
Lucas Lin
931234b451 Merge "Remove the network capabilities which are added twice" 2019-10-16 03:17:48 +00:00
Hall Liu
27b61580fe Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 
am: 510f917b94

Change-Id: I75b891ec471515d8472c79164486eaeb51ae6119
 2019-10-15 17:22:23 -07:00
Hall Liu
510f917b94 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" 
am: 15ddba32e0

Change-Id: Iaf41586e1eb679a003ba4fc52c4413617c71e7a7
 2019-10-15 17:08:32 -07:00
Hall Liu
15ddba32e0 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" 
* changes:
  Add new carrier config to extend DisconnectCause to play busy tone
  add certs to carrier configs and store them as UiccAccessRules
 2019-10-15 23:46:17 +00:00
Nathan Harold
e9fa64cc5c Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" am: 994f656312 
am: 32d164ba41

Change-Id: I57b40eb0cbaaca86367e81adf5f95875fbed2da2
 2019-10-15 15:55:00 -07:00
Nathan Harold
32d164ba41 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" 
am: 994f656312

Change-Id: I04af3edc7430db678bb1fb3f53d3f245d16f5f7d
 2019-10-15 15:45:04 -07:00
Nathan Harold
994f656312 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" 2019-10-15 22:29:52 +00:00
Xiangyu/Malcolm Chen
914861c2e0 Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd 
am: fd5d074f49

Change-Id: Ic7d62884ba9421f905f8d9a95bd5bee733a2cb31
 2019-10-15 13:52:35 -07:00
Xiangyu/Malcolm Chen
fd5d074f49 Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." 
am: 6ddfde96fd

Change-Id: Id0b4e6388a93e0cdc142ee44fea087031098419a
 2019-10-15 13:40:04 -07:00
Xiangyu/Malcolm Chen
6ddfde96fd Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." 2019-10-15 20:15:24 +00:00
Nathan Harold
fff052067c [DO NOT MERGE] Check CellInfoCallback Detail for Null 
In cases where the source of the CellInfo fails
but does not generate a Throwable, the detail info
will not be provided and should be null. Inside the
user process, we need to check for null before
dereferencing the detail object. Oops. :-(

Bug: 142706765
Bug: 142421696
Test: manual
Change-Id: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
 2019-10-15 12:49:37 -07:00
Xiangyu/Malcolm Chen
fd12f3d9bc Merge changes from topic "141388730" am: 50c4313058 
am: cc2d8d495d

Change-Id: I921654c18376d2854e001ec6118355075d46e5a6
 2019-10-15 11:35:57 -07:00
Andrei-Valentin Onea
cb6f65bc92 Merge "Example for disabling changes at test time" am: f39e53882c 
am: e831502b6b

Change-Id: I84adce06d64bd1f5f278d49c33a2398db97dd343
 2019-10-15 11:31:28 -07:00
Android Build Merger (Role)
fa4e7db9a0 Merge "Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca" into qt-r1-dev-plus-aosp 2019-10-15 18:26:20 +00:00
Dongwon Kang
bc0ae69350 Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a 
am: f5af5e5aca

Change-Id: I8ba72f4d85f377fadd7411a569400a222203dab1
 2019-10-15 11:25:20 -07:00
Dongwon Kang
4deafbba28 Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a 
am: f5af5e5aca

Change-Id: Ia4a073c2a1a88ab2e5ae6c0a1c2ba993a14f4317
 2019-10-15 11:21:55 -07:00
Xiangyu/Malcolm Chen
cc2d8d495d Merge changes from topic "141388730" 
am: 50c4313058

Change-Id: I0765cc4847d91a6902668756a31c7011bc5b4a54
 2019-10-15 11:11:04 -07:00
Xiangyu/Malcolm Chen
f0fd3492b5 Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am: 7d099030de 
am: 6270ac2534

Change-Id: I40db08d05733dcc766c6d887c372ac450d33bd9d
 2019-10-15 11:07:34 -07:00
Andrei-Valentin Onea
e831502b6b Merge "Example for disabling changes at test time" 
am: f39e53882c

Change-Id: I71349c840fe2baa598d5ef0050c32b78e409c14e
 2019-10-15 11:06:55 -07:00
Xiangyu/Malcolm Chen
50c4313058 Merge changes from topic "141388730" 
* changes:
  In CarrierTextController replace getPhoneCount with getMaxPhoneCount.
  Replace getPhoneCount with getMaxPhoneCount upon object allocation.
 2019-10-15 17:57:49 +00:00
Amit Mahajan
02a4c5ed58 Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201 
am: dd65089678

Change-Id: Ica45e366d4413355f1081d25d1a3a942397dc1ac
 2019-10-15 10:50:25 -07:00
Yi Kong
cfa361edca Merge "[hwui] Remove -Wno-missing-braces" am: d6e30691e5 
am: 6fecf93fea

Change-Id: Ie7abd502879603a9c9f1eb715567bad7051ec593
 2019-10-15 10:47:23 -07:00
Xin Li
a4909dcccf Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 
am: ee4eb8c39d

Change-Id: Ib2896199a09d9bfc02734ae910f0dcf47320700f
 2019-10-15 10:42:38 -07:00
Andrei-Valentin Onea
f39e53882c Merge "Example for disabling changes at test time" 2019-10-15 17:38:52 +00:00
Dongwon Kang
f5af5e5aca Merge "libmedia_jni: separate codeclist from libmedia" 
am: 1cec587b1a

Change-Id: Icb2c4d63e38969af62c38eff264c04bde89fbc86
 2019-10-15 10:30:04 -07:00
Xin Li
e83c435a49 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master 
am: 5c4d37fc17

Change-Id: If3d0f19f7347319f421fd0e56d224342045a91c8
 2019-10-15 10:10:33 -07:00
Treehugger Robot
1cec587b1a Merge "libmedia_jni: separate codeclist from libmedia" 2019-10-15 16:58:00 +00:00
lucaslin
3302cfc6dd Remove the network capabilities which are added twice 
Remove the network capabilities which are added twice in
createDefaultNetworkCapabilitiesForUid() and
createDefaultInternetRequestForTransport(). In the constructor
of NetworkCapabilities, it will add the DEFAULT_CAPABILITIES
which includes the NOT_RESTRICTED.

Bug: 142370233
Test: 1. Build pass.
      2. atest FrameworksNetTests
Change-Id: I7159909aec8faa7f25cef94195bdaea0fea55840
 2019-10-15 17:13:45 +08:00
Xiangyu/Malcolm Chen
6270ac2534 Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." 
am: 7d099030de

Change-Id: Icf628cf39c8690d486741a4610cf3ea610e3d490
 2019-10-14 21:58:40 -07:00
Xiangyu/Malcolm Chen
7d099030de Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." 2019-10-15 04:38:14 +00:00
Amit Mahajan
dd65089678 Merge "Move nist-sip from ext.jar to voip-common.jar" 
am: 1656b2b201

Change-Id: Ibb7a408310b9b2aa5e38f7966bfb26afef940841
 2019-10-14 20:14:49 -07:00
Amit Mahajan
1656b2b201 Merge "Move nist-sip from ext.jar to voip-common.jar" 2019-10-15 02:56:40 +00:00
Yi Kong
6fecf93fea Merge "[hwui] Remove -Wno-missing-braces" 
am: d6e30691e5

Change-Id: I63d4d6b012bc5408758040f91702d46f811d99fa
 2019-10-14 18:35:11 -07:00
Yi Kong
d6e30691e5 Merge "[hwui] Remove -Wno-missing-braces" 2019-10-15 01:21:56 +00:00
Saki Oomori
a70040841a Add new carrier config to extend DisconnectCause to play busy tone 
This carrier config is used to specify additional DisconnectCause for
playing busy tone.

Bug: 116189822
Test: manual - Checked that busy tone is played according to
"KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY".
Change-Id: I58afb08ddc718bfb23d6c8b4f248c4c05d084829
 2019-10-14 18:20:54 -07:00
Nazanin Bakhshi
693cec2025 add certs to carrier configs and store them as UiccAccessRules 
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
Merged-In: I50fb11444f0da33ae48683b834e6ca50941ad1b7
 2019-10-14 18:17:12 -07:00
Amit Mahajan
ecbc5f5ee9 Move nist-sip from ext.jar to voip-common.jar 
No component other than voip-common uses it.

Test: basic sanity
Bug: 140872785

Merged-in: Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a
Change-Id: Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a
(cherry picked from commit 18f5877436)
 2019-10-14 17:30:11 -07:00
TreeHugger Robot
ee4eb8c39d Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 2019-10-15 00:24:25 +00:00
Ryan Mitchell
5e3a1ba15f Merge "Allow protoc-gen-javastream to build statically" am: 6afb115dea 
am: 8e0b67272d

Change-Id: Ifabb5b2cbb46e18cd0c350d5bb1d6e20c202aa70
 2019-10-14 17:24:01 -07:00
Ryan Mitchell
8e0b67272d Merge "Allow protoc-gen-javastream to build statically" 
am: 6afb115dea

Change-Id: I156fdc5f37ff68fb84215b2a8ed13e1a17603a1f
 2019-10-14 17:11:22 -07:00
Xiangyu/Malcolm Chen
d320b73aac [automerger skipped] Merge "Check Carrier Privilege on Hidden Subs" am: f918b0dc57 -s ours 
am: dc6a94a114 -s ours
am skip reason: change_id Iad6a3c2635e5eac2d33a16aa460b98394fd817f4 with SHA1 b26cbbd53d is in history

Change-Id: I2e89d847c7a986fb88af5621dff921c864ead87a
 2019-10-14 16:43:34 -07:00
Treehugger Robot
6afb115dea Merge "Allow protoc-gen-javastream to build statically" 2019-10-14 23:42:23 +00:00