Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
447,530 Commits 3 Branches 0 Tags
d2eebf18408aa4bb7111fc0be5cf0da7759da2b0
Commit Graph

447530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
d2eebf1840 Merge "Revert "Revert "Remove overlay logic from package manager and parser""" 2019-10-15 22:06:41 +00:00
TreeHugger Robot
d5d0c8b8b4 Merge "Add feature to disable slices" 2019-10-15 21:54:26 +00:00
Hall Liu
5210215286 Merge "Add ImsReasonInfo constant for retrying without RTT" into qt-qpr1-dev am: fe19a93016 
am: 805b047be2

Change-Id: I8b81c51dc99680d9a02f986b6c239457c21fcd4e
 2019-10-15 14:32:15 -07:00
Hall Liu
805b047be2 Merge "Add ImsReasonInfo constant for retrying without RTT" into qt-qpr1-dev 
am: fe19a93016

Change-Id: Ie9a22097672630c6277c47f830459c9f3ecaf937
 2019-10-15 14:25:18 -07:00
Xiangyu/Malcolm Chen
1231ca4d6e [automerger skipped] Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd am: fd5d074f49 am: 914861c2e0 
am: 281e4ef4ec -s ours
am skip reason: change_id Idf7babd3ad0bcbde04b2a92761acf31ec9776a50 with SHA1 afe7d79964 is in history

Change-Id: If754c862285ca90483c3beb7fd0d5bbb9ff55cde
 2019-10-15 14:18:59 -07:00
Xiangyu/Malcolm Chen
281e4ef4ec Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd am: fd5d074f49 
am: 914861c2e0

Change-Id: Ibcdf9922d0be31508f22cee3fc6e5b76d26f1df7
 2019-10-15 14:04:56 -07:00
Hall Liu
fe19a93016 Merge "Add ImsReasonInfo constant for retrying without RTT" into qt-qpr1-dev 2019-10-15 21:00:18 +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
Danny Epstein
6d041cbe28 Merge "Only update privacy chip when privacy items change" 2019-10-15 20:33:00 +00:00
Xiangyu/Malcolm Chen
6ddfde96fd Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." 2019-10-15 20:15:24 +00:00
Xiangyu/Malcolm Chen
fdc7249dc0 [automerger skipped] Merge changes from topic "141388730" am: 50c4313058 am: cc2d8d495d am: fd12f3d9bc 
am: a99f27b4a4 -s ours
am skip reason: change_id I141689fc55063d87f4f7e5c605a461517beeabe4 with SHA1 7a6936f172 is in history

Change-Id: Ieffa2266dd277d1c51b54b9183a00840645230fc
 2019-10-15 12:27:20 -07:00
Andrei-Valentin Onea
b4e65ea044 Merge "Example for disabling changes at test time" am: f39e53882c am: e831502b6b am: cb6f65bc92 
am: d4f5aa7613

Change-Id: Idaab147e8a5ee98aac6aaffc78248e5fe34898ea
 2019-10-15 12:19:29 -07:00
Dongwon Kang
e36b284d7a [automerger skipped] Merge "Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca" into qt-r1-dev-plus-aosp am: fa4e7db9a0 -s ours 
am: fd549e6e16 -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 097fc5fe58 is in history

Change-Id: Ib97609348774be008a8038d85a1f95c53e1fad3d
 2019-10-15 12:14:31 -07:00
Dongwon Kang
4c26e5e19d [automerger skipped] Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca am: 4deafbba28 
am: 21bc2b877c -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 cc73dda80b is in history

Change-Id: Ie8b1314f5ecae517a673ba0617f1397d8e092e66
 2019-10-15 12:05:15 -07:00
Xiangyu/Malcolm Chen
a99f27b4a4 Merge changes from topic "141388730" am: 50c4313058 am: cc2d8d495d 
am: fd12f3d9bc

Change-Id: I38415b3b9c5d18c6801f7ef6abc53f0ee8e6c7e5
 2019-10-15 11:55:24 -07:00
Xiangyu/Malcolm Chen
5078176fed [automerger skipped] Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am: 7d099030de am: 6270ac2534 am: f0fd3492b5 
am: 5b4fed76eb -s ours
am skip reason: change_id Idd48da2948013e00393819fcf22b6ede509c2f0c with SHA1 2c95aa9b5a is in history

Change-Id: I93ae8cc67ef1c27b7325352f9fe79e1b7c26f496
 2019-10-15 11:52:36 -07:00
Andrei-Valentin Onea
d4f5aa7613 Merge "Example for disabling changes at test time" am: f39e53882c am: e831502b6b 
am: cb6f65bc92

Change-Id: If4dc3aacacb2ef0930470327ebd81d0878e988a3
 2019-10-15 11:52:26 -07:00
Dongwon Kang
fd549e6e16 [automerger skipped] Merge "Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca" into qt-r1-dev-plus-aosp 
am: fa4e7db9a0 -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 097fc5fe58 is in history

Change-Id: I0285d55d6d9d1180150641b593104ea95b83d02a
 2019-10-15 11:51:24 -07:00
Amit Mahajan
a1372a9b5d [automerger skipped] Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201 am: dd65089678 am: 02a4c5ed58 
am: fe418b9d04 -s ours
am skip reason: change_id Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a with SHA1 18f5877436 is in history

Change-Id: I9221b6e2a503e795b692e6a99464e0e5a1c89dbc
 2019-10-15 11:46:48 -07:00
Dongwon Kang
21bc2b877c Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca 
am: 4deafbba28

Change-Id: I476a2304f707a4afc51bd78201c8b314e5b7a9fa
 2019-10-15 11:45:54 -07:00
Yi Kong
8a395e7a37 Merge "[hwui] Remove -Wno-missing-braces" am: d6e30691e5 am: 6fecf93fea am: cfa361edca 
am: 853445d1a9

Change-Id: I9b9d02dee4da411e0c6f2138ec341384f8e7c174
 2019-10-15 11:42:18 -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
Xin Li
06d6a175d0 [automerger skipped] Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master am: ee4eb8c39d am: a4909dcccf 
am: ae4f9150f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ba766329f91e28782feadf2c99fb973f188854a
 2019-10-15 11:33:37 -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
Amit Mahajan
fe418b9d04 Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201 am: dd65089678 
am: 02a4c5ed58

Change-Id: Ib6869d36e2b0b4e8a079f4f6f3c2bbaa50b30be1
 2019-10-15 11:17:14 -07:00
Yi Kong
853445d1a9 Merge "[hwui] Remove -Wno-missing-braces" am: d6e30691e5 am: 6fecf93fea 
am: cfa361edca

Change-Id: I448e074fb43e7c515c75dec55ca6b9ba99d47330
 2019-10-15 11:14:38 -07:00
TreeHugger Robot
31b31c7101 Merge "Add acquire/release wake lock benchmark" 2019-10-15 18:13:27 +00:00
Philip P. Moltmann
aad41eb667 Merge "Add useful app-op-note message to async Location deliveries" 2019-10-15 18:11:31 +00:00
Xiangyu/Malcolm Chen
cc2d8d495d Merge changes from topic "141388730" 
am: 50c4313058

Change-Id: I0765cc4847d91a6902668756a31c7011bc5b4a54
 2019-10-15 11:11:04 -07:00
TreeHugger Robot
d6f976fb2f Merge "Add getPackageIntentForSender benchmark" 2019-10-15 18:10:54 +00:00
Xin Li
ae4f9150f7 Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master am: ee4eb8c39d 
am: a4909dcccf

Change-Id: Icf462478df09bac38493dde1c96b45a48f6306d9
 2019-10-15 11:09:43 -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
Xin Li
33f28b69e0 [automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 5c4d37fc17 am: e83c435a49 
am: 76d596dc62 -s ours
am skip reason: subject contains skip directive

Change-Id: I9c4e4f0cc506d8cb6ff1112513cffccb8e2de0bb
 2019-10-15 10:48:39 -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
76d596dc62 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 5c4d37fc17 
am: e83c435a49

Change-Id: I8c41601f55bf10e6503b0133f44c1526946a66b3
 2019-10-15 10:29:45 -07:00
Christine Tsai
851b47677d Merge "Take 2: Integrate StateTracker into statsd" 2019-10-15 17:27:04 +00:00
TreeHugger Robot
50beaa7608 Merge "Make getEcno() public." 2019-10-15 17:26:25 +00:00
Abhijit Adsule
95862c5724 Add feature to disable slices 
Bug: 142022263
Change-Id: I090b4c1460fcc4784e9e901847829ee61bfc31ef
 2019-10-15 10:11:16 -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