Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
445,059 Commits 3 Branches 0 Tags
1a78386309ca2c895f28db733a924559aa7f9716
Commit Graph

445059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
1a78386309 Merge "Move NetworkAgent#register to a new method." am: 9309eea2fe am: 73e201927e 
Change-Id: I069ef3b6573bcb4377c730097c73e153d2ab4df1
 2020-03-03 04:08:58 +00:00
Automerger Merge Worker
73e201927e Merge "Move NetworkAgent#register to a new method." am: 9309eea2fe 
Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713
 2020-03-03 03:52:17 +00:00
Aaron Huang
9309eea2fe Merge "Move NetworkAgent#register to a new method." 2020-03-03 03:37:07 +00:00
Automerger Merge Worker
41d8d53769 Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456f4 am: 710aa1f501 
Change-Id: Ibb46d43dcd5cffdbe3b239a9edcc29dbc7aeacb7
 2020-03-03 03:21:30 +00:00
Automerger Merge Worker
710aa1f501 Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456f4 
Change-Id: I40cdb43db6f6f6ed3400ebfcbc48a0402850a3f5
 2020-03-03 03:05:30 +00:00
Treehugger Robot
d63d2456f4 Merge "Use removeActiveDevice() when set phone as active device" 2020-03-03 02:54:14 +00:00
TreeHugger Robot
7261434cd8 Merge "resolve merge conflicts of d9d21afdd4 to qt-qpr1-dev-plus-aosp" into qt-qpr1-dev-plus-aosp 2020-03-03 00:02:46 +00:00
Jay Aliomer
e355e97c50 resolve merge conflicts of d9d21afdd4 to qt-qpr1-dev-plus-aosp 
Change-Id: I59ed1086133919e4cf3594128a65ff85bdcc6651
 2020-03-02 23:58:52 +00:00
Automerger Merge Worker
fcf06681ee Merge "Add carrier config to show wifi calling icon in status bar" am: d5579959e4 am: 6ab26e6bf5 
Change-Id: Ie660d6a19770d19c4482207de0047f820f394a0b
 2020-03-02 23:46:03 +00:00
Automerger Merge Worker
0e7c41cafc Merge "Shell: Grant NETWORK_STACK permission for CTS" am: 686594b470 am: dc701f5f56 
Change-Id: I83958b23099f8a0633786ec6df27443b47d468fb
 2020-03-02 23:45:47 +00:00
Automerger Merge Worker
6ab26e6bf5 Merge "Add carrier config to show wifi calling icon in status bar" am: d5579959e4 
Change-Id: I593a40536a0f0cb290f197e1dbcadbc7ffde6b8b
 2020-03-02 23:32:48 +00:00
Automerger Merge Worker
dc701f5f56 Merge "Shell: Grant NETWORK_STACK permission for CTS" am: 686594b470 
Change-Id: Idf92a671e8d780b4d53219be184bc1983fbd2380
 2020-03-02 23:32:35 +00:00
Automerger Merge Worker
97316e6c08 Merge "Fix carrier config string typo." into qt-qpr1-dev am: 0b5967db15 
Change-Id: If354e796e1172ac3e10e0d95e1b29912d98d4dcb
 2020-03-02 23:32:10 +00:00
Jayachandran Chinnakkannu
d5579959e4 Merge "Add carrier config to show wifi calling icon in status bar" 2020-03-02 23:26:55 +00:00
Jay Aliomer
d9d21afdd4 Merge "Back porting Dark theme bug fixes from R" into qt-qpr1-dev 2020-03-02 23:18:48 +00:00
Jay Aliomer
cfb9aa79d3 Merge "Back porting Dark theme bug fixes from R" into qt-qpr1-dev-plus-aosp 2020-03-02 23:18:48 +00:00
David Su
686594b470 Merge "Shell: Grant NETWORK_STACK permission for CTS" 2020-03-02 23:14:42 +00:00
TreeHugger Robot
0b5967db15 Merge "Fix carrier config string typo." into qt-qpr1-dev 2020-03-02 23:14:27 +00:00
Automerger Merge Worker
a1b17ae07e Merge "[API Review] Expose sendOrderedBroadcast" am: b0157c3ee3 am: f1124753ed 
Change-Id: Ieda3a33090f627f882faecbadb0a29aee7790bf2
 2020-03-02 22:09:34 +00:00
Automerger Merge Worker
f1124753ed Merge "[API Review] Expose sendOrderedBroadcast" am: b0157c3ee3 
Change-Id: I686308c2af6e31a30c211d25adea416d556e5cd1
 2020-03-02 21:59:55 +00:00
Peter Wang
b0157c3ee3 Merge "[API Review] Expose sendOrderedBroadcast" 2020-03-02 21:50:13 +00:00
Automerger Merge Worker
83bc03bff4 [automerger skipped] Merge "FocusRequester: fix NPE" into qt-qpr1-dev am: 1dff734a27 -s ours 
am skip reason: Change-Id I88447a255132c94f8c2fbf97a1e3ee88f6d2e993 with SHA-1 8fc4ae4938 is in history

Change-Id: Ie8db63c69a6967366bed5bde8a2057b0e633f1d2
 2020-03-02 21:06:32 +00:00
Automerger Merge Worker
a59c30438b Merge "AudioService - remove sendBroadcastToAll() from setMasterMuteInternalNoCallerCheck()" into qt-qpr1-dev am: cf5442cc03 
Change-Id: Ie66908bb8a8c6a9196fe7d99a83edb79d8a090d9
 2020-03-02 21:06:05 +00:00
TreeHugger Robot
1dff734a27 Merge "FocusRequester: fix NPE" into qt-qpr1-dev 2020-03-02 21:04:49 +00:00
Automerger Merge Worker
247f8680e4 Merge "Rewriting phone constants for mainline" am: 03c3d36ce8 am: 5a935b209f 
Change-Id: Ibb46c566901a8e11939ff494144c63e84e771505
 2020-03-02 20:57:09 +00:00
Agatha Man
cf5442cc03 Merge "AudioService - remove sendBroadcastToAll() from setMasterMuteInternalNoCallerCheck()" into qt-qpr1-dev 2020-03-02 20:56:34 +00:00
Automerger Merge Worker
5a935b209f Merge "Rewriting phone constants for mainline" am: 03c3d36ce8 
Change-Id: I354cec0b3891a8cdc1f8069dd6b7de523a08aa5f
 2020-03-02 20:39:58 +00:00
Daniel Bright
03c3d36ce8 Merge "Rewriting phone constants for mainline" 2020-03-02 20:31:24 +00:00
Automerger Merge Worker
fd474bb882 Merge "Make isDataCapable a public API" am: bdee4edb08 am: 1e83a9eaf9 
Change-Id: If943a821eb8004b7a7e6782f3490c0d903b58a63
 2020-03-02 19:44:31 +00:00
Automerger Merge Worker
8db5cfd440 Merge "Make string version of APN_TYPEs a @SystemApi" am: 941ff72b3b am: 49232cca9b 
Change-Id: If8114cbc374f4327f05299e7900d51661fb2016f
 2020-03-02 19:44:21 +00:00
Automerger Merge Worker
1e83a9eaf9 Merge "Make isDataCapable a public API" am: bdee4edb08 
Change-Id: Icc763a920ec7e6ad780da7b70bd585f80e126454
 2020-03-02 19:28:48 +00:00
Automerger Merge Worker
49232cca9b Merge "Make string version of APN_TYPEs a @SystemApi" am: 941ff72b3b 
Change-Id: Id9fa0069b704ea9cf78782f4c13c4fec47752954
 2020-03-02 19:28:31 +00:00
Daniel Bright
bdee4edb08 Merge "Make isDataCapable a public API" 2020-03-02 19:14:40 +00:00
Daniel Bright
941ff72b3b Merge "Make string version of APN_TYPEs a @SystemApi" 2020-03-02 19:13:48 +00:00
Automerger Merge Worker
c1be9eb0f9 Merge "Delete size limitation for ContrastColorUtil.isGrayScale() method. loss of performance is tiny because, image will be resized at ImageUtil.isGrayscale() method." am: 8157fac634 am: 55e52fcf66 
Change-Id: I670b20e86244230621894181374060479b255187
 2020-03-02 19:11:54 +00:00
Automerger Merge Worker
f5f982f038 Merge "Add dbright to owners" am: 671d2ee627 am: 9593b26e9f 
Change-Id: I630e63589fd4f1fb761ecf2da38cf369504eea7d
 2020-03-02 19:11:39 +00:00
Automerger Merge Worker
55e52fcf66 Merge "Delete size limitation for ContrastColorUtil.isGrayScale() method. loss of performance is tiny because, image will be resized at ImageUtil.isGrayscale() method." am: 8157fac634 
Change-Id: I3abd10637d164a5501d380af70ae2a98afbc84bb
 2020-03-02 18:55:28 +00:00
Automerger Merge Worker
9593b26e9f Merge "Add dbright to owners" am: 671d2ee627 
Change-Id: Ib6ee042e71aced9b16271a93b9ecc52af73e7788
 2020-03-02 18:55:16 +00:00
Automerger Merge Worker
807600ac9e Merge "DO NOT MERGE Add toast message when bluetooth connects to voice recognition." into qt-qpr1-dev am: 674bf0280f 
Change-Id: If49bb402d68d1d228ec8611963fd3c1a13c4603c
 2020-03-02 18:54:48 +00:00
Automerger Merge Worker
41823826ed DO NOT MERGE Add toast message when bluetooth connects to voice recognition. am: d0555bba57 
Change-Id: Ieb5b49b64202fd0653c9a1ff2699edcc486e0ca9
 2020-03-02 18:54:38 +00:00
Treehugger Robot
8157fac634 Merge "Delete size limitation for ContrastColorUtil.isGrayScale() method. loss of performance is tiny because, image will be resized at ImageUtil.isGrayscale() method." 2020-03-02 18:44:09 +00:00
Daniel Bright
671d2ee627 Merge "Add dbright to owners" 2020-03-02 18:42:16 +00:00
Babak Bostan
674bf0280f Merge "DO NOT MERGE Add toast message when bluetooth connects to voice recognition." into qt-qpr1-dev 2020-03-02 18:39:07 +00:00
Automerger Merge Worker
4fd937c87e Merge changes from topic "ikeparams-api-change" am: eabf5d707c am: 5a5ed6e90b 
Change-Id: Id6e37286e3465eae267170c99fb84ee56166caa9
 2020-03-02 18:06:32 +00:00
Automerger Merge Worker
2c2f2e45f5 Remove UdpEncapsulationSocket references in VPNs am: 2796cff6f5 am: 879623ff14 
Change-Id: I306747e20a6ee3c612d26f7c687c787f65490541
 2020-03-02 18:06:30 +00:00
Automerger Merge Worker
5a5ed6e90b Merge changes from topic "ikeparams-api-change" am: eabf5d707c 
Change-Id: I867ee35f13f20a557bda343092229b3630f970cc
 2020-03-02 17:44:42 +00:00
Automerger Merge Worker
879623ff14 Remove UdpEncapsulationSocket references in VPNs am: 2796cff6f5 
Change-Id: I2d002ab03cddd4c88b3ee5b212ffbe06e4fc3dd3
 2020-03-02 17:44:36 +00:00
Yan Yan
eabf5d707c Merge changes from topic "ikeparams-api-change" 
* changes:
  Pass server address directly to IKE.
  Remove UdpEncapsulationSocket references in VPNs
 2020-03-02 17:22:59 +00:00
Automerger Merge Worker
7c71dfa07e [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 7cadca43f2 -s ours am: a9c9399e96 -s ours 
am skip reason: Change-Id I067cdc404e5a63947c19cb75069a39ae42faa3c8 with SHA-1 57683a232f is in history

Change-Id: I97618fd4abcd989ed3d39bc538c53a2031a0904b
 2020-03-02 10:26:28 +00:00
Automerger Merge Worker
a9c9399e96 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 7cadca43f2 -s ours 
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 80abddc763 is in history

Change-Id: Ia18edfd8fed3ec197fcacd086c4b7fe2f4b5f47d
 2020-03-02 10:12:36 +00:00