drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
461,513 Commits 1 Branch 0 Tags
Commit Graph

461513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
6680093a52 Move 'privapp_whitelist_com.android.settings' to system_ext am: 45e55d1892 am: d7a05da249 
Change-Id: I19ff106448c96df195b9ecb8c65a3430aab4b03c
 2020-01-17 21:49:18 +00:00
Automerger Merge Worker
d25caa5e2c move privapp_whitelist_com.android.provision to system_ext am: 64bc816852 am: ee68caeccc 
Change-Id: I15d7a16dcb979ffed0e44c1a90e1980d780b4405
 2020-01-17 21:49:15 +00:00
Automerger Merge Worker
74bd22511e privapp_whitelist_com.android.emergency to system_ext am: b3d1dc096a am: d72050e289 
Change-Id: Ib13b9ec4ac1c1b7f5464a1db2ba6cdc8eb99bda2
 2020-01-17 21:49:13 +00:00
Automerger Merge Worker
ba242d08d1 privapp_whitelist_com.android.carrierconfig to system_ext am: 6350ba9b49 am: 396d84d8b8 
Change-Id: Iba8e4799d375f895c76e99ce1491dd9d9926af63
 2020-01-17 21:49:08 +00:00
Automerger Merge Worker
782b1edcb7 Merge "Add call barring constants to ImsUtImplBase" am: 87cf4b146e am: c27cece2a5 am: 80191c2775 
Change-Id: I5b476a1e0af70d65ba6b04d775ef54ae812d198d
 2020-01-17 21:48:58 +00:00
Automerger Merge Worker
8888c82df6 Merge "p2p: revise tethering handler for shared group interface support" am: 0bbf289b09 am: bbbe6f7ba5 am: c9bde4be72 
Change-Id: I512a950fc395518bc46dd99590bfdcbe3b10bed3
 2020-01-17 21:48:36 +00:00
Automerger Merge Worker
193072d699 Merge "Expose TelephonyManager constants as SystemApi" am: 15720f61d9 am: 14676c2053 am: 86973d1b60 
Change-Id: I7ae58e7bbd97420d91c825c92993620495b4ccfa
 2020-01-17 21:48:18 +00:00
Automerger Merge Worker
8cdcce294a Merge "Expose MMS constants" am: 9681a661ae am: 102bafea2f am: bccd39ed28 
Change-Id: I857db2796c0a712ac19ecee21dbe5ccabbd50e18
 2020-01-17 21:47:59 +00:00
Automerger Merge Worker
edde27aa7e Merge "Merge "Update API surface for ICU 66.0.1" am: d092e7cb86" into stage-aosp-master am: 36a5bd83f1 
Change-Id: I3331385154b8a321cdeba0b2455cb7d92b18b854
 2020-01-17 21:47:43 +00:00
Automerger Merge Worker
2d16d37253 Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad am: 7a3082f680 am: 5cdde8b871 
Change-Id: I30420d209d39b112c9569525355895d6f1924277
 2020-01-17 21:47:34 +00:00
Automerger Merge Worker
833d23d528 Merge "NetworkStatsFactory.cpp: IWYU" am: f67ff418f3 am: 7b7e46590a am: 78f7cecfe8 
Change-Id: I75378b3435eb63599758b60c687abbce20b8b65d
 2020-01-17 21:47:19 +00:00
Automerger Merge Worker
4a87dead9a Merge "Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9" into stage-aosp-master am: 85bf0f73d0 
Change-Id: I7dec0f34c1a2f17fd2abd1f79908c8d8eb07e1be
 2020-01-17 21:47:13 +00:00
Automerger Merge Worker
3bc1a1c845 [automerger skipped] Merge "Make SignalStrength constructor system APIs" am: e9f4fe3c02 am: ccb8121268 am: e1f00d446f -s ours 
am skip reason: Change-Id I80693b0f1b1f9de1a8c93ce8a23a816346afb634 with SHA-1 89e4e0c1e9 is in history

Change-Id: I92cc763b58aef26ddfb31c1ed0e09ed6ae393847
 2020-01-17 21:46:38 +00:00
Automerger Merge Worker
db99de9ea8 [automerger skipped] Merge changes from topic "manual-zygote-snap" am: 391bc94404 am: c39334a805 am: 74044e3da2 -s ours 
am skip reason: Change-Id If046aa62084892b8dae10497f15cf4c685d226db with SHA-1 523ae8e3fb is in history

Change-Id: I1aa4befbad6c29f3dffefa057637a768279b9dec
 2020-01-17 21:46:18 +00:00
Automerger Merge Worker
aa1ee89461 [automerger skipped] Improved timekeeping logic for USAP Pool refill mechanism. am: d8ef116993 am: c57c1c3356 am: 619fb8050b -s ours 
am skip reason: Change-Id Ic6f65de51757803b5ba95975bab3b9322a91c837 with SHA-1 2f37bb1f6a is in history

Change-Id: I5c61385b62d47d2f78cad3b2f6778a61e06389ec
 2020-01-17 21:46:15 +00:00
Automerger Merge Worker
29d8124171 [automerger skipped] Resets the refill action/timing info after a pool fill event. am: b28db4abbc am: 0186924384 am: ff624af5e0 -s ours 
am skip reason: Change-Id I9ee74d76692fa8aeba9c70765b3e8f98ea9105bc with SHA-1 45264b7423 is in history

Change-Id: I2c0b9a662329669d426edb1bc0ba798c07725c41
 2020-01-17 21:46:09 +00:00
Automerger Merge Worker
b6a1059643 [automerger skipped] Make the USAP Pool refill delay configurable. am: eabbf8720c am: d5c2d5d792 am: 20b1fc4dcb -s ours 
am skip reason: Change-Id Idfeb30fa62fa296492da211b2b44902ff4f99b18 with SHA-1 3deb2b5b7a is in history

Change-Id: I9d43e6bade7270e03ff02cf00aae99b2e54ad6e7
 2020-01-17 21:46:06 +00:00
Automerger Merge Worker
63dbeefea0 [automerger skipped] Re-adds a trace point that was accidentally removed. am: 7e9f83e18a am: 16d1a78e67 am: a8f1b1a6fc -s ours 
am skip reason: Change-Id Ic75d65fc7b2a417fc3a58c2df8ec9deb795fb418 with SHA-1 8b8d58cc94 is in history

Change-Id: I4bfcdf64365128373180f5dca7b67081611f02cf
 2020-01-17 21:46:00 +00:00
Automerger Merge Worker
2a4c74b6a0 [automerger skipped] Moved some thread priority changes. am: 9091be3eb7 am: bbfa310ef2 am: 5c7563cee9 -s ours 
am skip reason: Change-Id Iad2e17cd137eab81c595cb6816608a36b009da8b with SHA-1 9cbcf722ec is in history

Change-Id: I995ea3c9b85823e002dd0cdd95dccd21f10caf51
 2020-01-17 21:45:54 +00:00
Automerger Merge Worker
d342bf5244 [automerger skipped] Adjust Java Language thread priority in new processes. am: 80993a6e60 am: 13839cfe41 am: 30df04e3c4 -s ours 
am skip reason: Change-Id Id00d0cfd642f02640c40b6e7b2aa8933a320b60c with SHA-1 ca49f49053 is in history

Change-Id: Icc89ed1bef91dd8e2121917beb593471447d1006
 2020-01-17 21:45:48 +00:00
Automerger Merge Worker
b273c4a17c Merge "Update API surface for ICU 66.0.1" am: d092e7cb86 am: b453b3dea9 
Change-Id: I0a14ae285c575d30018407ac759acf303439398f
 2020-01-17 21:45:40 +00:00
Automerger Merge Worker
5d206977f8 [automerger skipped] Adjusts the USAP pool refill mechanism. am: 0b2fbfcf6f -s ours am: 1e60d390af -s ours am: 4fa7b27acc -s ours 
am skip reason: Change-Id I7328f304c9b744cfdbfbdbe522a5f9aeea5233bb with SHA-1 119508293b is in history

Change-Id: I2bcc8f6e5ef46d756729caa5eb1001579880d1cb
 2020-01-17 21:45:38 +00:00
Automerger Merge Worker
5f906fa5b3 Merge "Merge "add java_api_finder plugin to tethering module" am: 05c43b7095" into stage-aosp-master am: 6de4ca758f 
Change-Id: I417ab29c84dc3f10ee317a184f59d25184c7dfdc
 2020-01-17 21:45:15 +00:00
Automerger Merge Worker
fbfeaacb9f [automerger skipped] Merge commit '75d29775398d5033a6a3e67a307a8fbc1299b53c' into manual_merge_75d29775398d5033a6a3e67a307a8fbc1299b53c am: 1d2806de40 -s ours 
am skip reason: Change-Id Id3a3d0b2b66d31c48274f8a986e86e9ed1d28f34 with SHA-1 c170754bee is in history

Change-Id: I330160de5b05efceaf2e7cfdeb1ad60358310a7c
 2020-01-17 21:44:50 +00:00
Automerger Merge Worker
6eeecb51a4 Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9 am: 9ffe0e8fd6 
Change-Id: I599ae1de9e264bdbc099bd620f797dac1e48c55c
 2020-01-17 21:44:27 +00:00
Automerger Merge Worker
a277a46187 Merge "add java_api_finder plugin to tethering module" am: 05c43b7095 am: 1d97c995f2 
Change-Id: I7c7ed50c577e3cb077646933d318620b89a9672d
 2020-01-17 21:43:26 +00:00
hkuang
e73bf23cef Unhide some camera recording constants. 
Bug: 147659444
Test: Build
Change-Id: I76d1084774fdbd3a557135b06dd68730ed52bbe8
 2020-01-17 13:43:18 -08:00
Automerger Merge Worker
722ee27372 Merge "Vibrator: Have Always-On Check DND/LowPower Modes" am: 301beddcdb am: f184b6b8d6 
Change-Id: I450d4728f0b4e570f1f384034b3df56400c32c6d
 2020-01-17 21:42:27 +00:00
Brad Ebinger
be898cce4f Merge "Expose proprietary extras Bundle in ImsCallProfile" 
am: 8804a86b87

Change-Id: I1c8dbf6944bd5713d34486029d6f9deb95e8f2ff
 2020-01-17 13:41:16 -08:00
Automerger Merge Worker
5972b964e9 Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: ad189b5e60 am: 400ee161ad 
Change-Id: I8d68833469bf09d843344be2cdce426f7575f4d3
 2020-01-17 21:41:06 +00:00
Automerger Merge Worker
44dbd82667 Merge "[Telephony Mainline] Removed IPackageManager reference" am: b114707641 am: 663cc563a4 
Change-Id: Id75f7fcc984e8f9c9be388b198dc3e296940040d
 2020-01-17 21:40:14 +00:00
Automerger Merge Worker
dbb66deae3 Merge "Exposing NetworkRegistrationInfo for PS service" am: 3ae8d12fe6 am: 4e34673c9a 
Change-Id: I2965d9e1573d1c84cef7053ce7cbf61ac405ec5f
 2020-01-17 21:39:31 +00:00
Automerger Merge Worker
ed241470c6 Merge "Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad" into stage-aosp-master am: 324ee26278 
Change-Id: I57ad6c895759f47f7e71c79ef6aae6ec4a1eee46
 2020-01-17 21:39:10 +00:00
Xiangyu/Malcolm Chen
179e23dfe9 Merge "Copy @hide util files into framework-telephony." 2020-01-17 21:38:39 +00:00
Automerger Merge Worker
80191c2775 Merge "Add call barring constants to ImsUtImplBase" am: 87cf4b146e am: c27cece2a5 
Change-Id: I522a6bac0d761d7dd7017594980851e1851974f0
 2020-01-17 21:38:33 +00:00
Automerger Merge Worker
c9bde4be72 Merge "p2p: revise tethering handler for shared group interface support" am: 0bbf289b09 am: bbbe6f7ba5 
Change-Id: Iffd11fbd80c16bc73526d6f883762940b6b1732e
 2020-01-17 21:38:08 +00:00
Automerger Merge Worker
86973d1b60 Merge "Expose TelephonyManager constants as SystemApi" am: 15720f61d9 am: 14676c2053 
Change-Id: I2b68f7f210a758a3e20e0373ddd03ed09cfec7de
 2020-01-17 21:37:24 +00:00
Automerger Merge Worker
bccd39ed28 Merge "Expose MMS constants" am: 9681a661ae am: 102bafea2f 
Change-Id: Ic7fbf24bbeb713585cd5143c58debb7f807a38ae
 2020-01-17 21:36:39 +00:00
Automerger Merge Worker
5cdde8b871 Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad am: 7a3082f680 
Change-Id: Ieed00f05b7feb5da3fd0970e6a213d83f860a4e6
 2020-01-17 21:36:13 +00:00
Automerger Merge Worker
78f7cecfe8 Merge "NetworkStatsFactory.cpp: IWYU" am: f67ff418f3 am: 7b7e46590a 
Change-Id: I16f481d9c954848feb12db5be9563ec1ff49bcb6
 2020-01-17 21:35:47 +00:00
Automerger Merge Worker
e1f00d446f Merge "Make SignalStrength constructor system APIs" am: e9f4fe3c02 am: ccb8121268 
Change-Id: Ib5af1b5017062ca130c7d61d2ca7977a8fe9f618
 2020-01-17 21:35:19 +00:00
Calvin Huang
165bf8f44a Set overlayable for CarsystemUI NavBar 
Bug: 142822006
Test: Nav icons should be hidden accordingly
Change-Id: I88d954c03076dfa9489564e0a9684be265f4c886
 2020-01-17 13:33:48 -08:00
Automerger Merge Worker
74044e3da2 Merge changes from topic "manual-zygote-snap" am: 391bc94404 am: c39334a805 
Change-Id: Ie806e8d213b6a959bb76b7b29ff8a514d3c3c788
 2020-01-17 21:29:44 +00:00
Automerger Merge Worker
619fb8050b Improved timekeeping logic for USAP Pool refill mechanism. am: d8ef116993 am: c57c1c3356 
Change-Id: Idd8eb17a943cff74c68ecc2d0d10c7d8d17ef197
 2020-01-17 21:29:41 +00:00
Automerger Merge Worker
ff624af5e0 Resets the refill action/timing info after a pool fill event. am: b28db4abbc am: 0186924384 
Change-Id: I12cda089f3f9dd91c6b348bb54e4aa5cb48675a4
 2020-01-17 21:29:38 +00:00
Automerger Merge Worker
20b1fc4dcb Make the USAP Pool refill delay configurable. am: eabbf8720c am: d5c2d5d792 
Change-Id: I81cc2eea1731e891b5a76ea65b17f317b8a09997
 2020-01-17 21:29:34 +00:00
Automerger Merge Worker
a8f1b1a6fc Re-adds a trace point that was accidentally removed. am: 7e9f83e18a am: 16d1a78e67 
Change-Id: Id678fc0a0d167fa9e66e1cc84145705726ebf203
 2020-01-17 21:29:31 +00:00
Automerger Merge Worker
5c7563cee9 Moved some thread priority changes. am: 9091be3eb7 am: bbfa310ef2 
Change-Id: Ief3eecda9afea398ef8600905ec58f50fae31944
 2020-01-17 21:29:29 +00:00
Automerger Merge Worker
30df04e3c4 Adjust Java Language thread priority in new processes. am: 80993a6e60 am: 13839cfe41 
Change-Id: Ib38cce74940011523947212cd59b20472805209c
 2020-01-17 21:29:26 +00:00
Automerger Merge Worker
4fa7b27acc [automerger skipped] Adjusts the USAP pool refill mechanism. am: 0b2fbfcf6f -s ours am: 1e60d390af -s ours 
am skip reason: Change-Id I7328f304c9b744cfdbfbdbe522a5f9aeea5233bb with SHA-1 119508293b is in history

Change-Id: Ib29df7aaf34669f4b6d4432bcd6d74f174ae397b
 2020-01-17 21:29:24 +00:00