frameworks_base.git - frameworks

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \| \|	Merge "[VCN15] expose addUnwantedCapability and related APIs" into sc-dev	Lorenzo Colitti	2021-03-23	1	-10/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	[VCN15] expose addUnwantedCapability and related APIs	junyulai	2021-03-22	1	-10/+30
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208f	Lorenzo Colitti	2021-03-22	1	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca	Lorenzo Colitti	2021-03-22	1	-0/+16
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix privileged apps calling registerDefaultNetworkCallback.	Lorenzo Colitti	2021-03-22	1	-3/+2
\| \| * \| \| \| \| \| \| \| \|	Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback.	Lorenzo Colitti	2021-03-22	1	-0/+17
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-...	Roshan Pius	2021-03-21	2	-84/+286
\| \|\\| \| \| \| \| \| \| \| \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYT...	Treehugger Robot	2021-03-21	4	-243/+497
\| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	TransportInfo: Add a generic redaction mechanism	Roshan Pius	2021-03-19	2	-84/+286
\| \| * \| \| \| \| \| \|	Revert^2 "Replace the usage of UidRange"	Chiachang Wang	2021-03-19	4	-159/+211
\| * \| \| \| \| \| \| \|	Use module resources in NetworkNotificationManager.	Lorenzo Colitti	2021-03-21	2	-1/+26
\| * \| \| \| \| \| \| \|	Cherry-pick some test changes from ag/13210542.	Lorenzo Colitti	2021-03-21	1	-3/+4
\| * \| \| \| \| \| \| \|	Remove unused NetworkPolicyManagerInternal in CS	paulhu	2021-03-20	2	-10/+0
\| * \| \| \| \| \| \| \|	Migrate framework-connectivity internal resources	Remi NGUYEN VAN	2021-03-20	3	-9/+45
* \| \| \| \| \| \| \| \|	Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev	Lucas Lin	2021-03-22	1	-9/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove the usage of NETID_UNSET from Vpn.java	lucaslin	2021-03-22	1	-9/+9
* \| \| \| \| \| \| \| \|	Merge "Use connectivity resources in service-connectivity" into sc-dev	Lorenzo Colitti	2021-03-22	2	-14/+23
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use connectivity resources in service-connectivity	Remi NGUYEN VAN	2021-03-21	2	-14/+23
* \| \| \| \| \| \| \| \|	resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-...	Roshan Pius	2021-03-21	2	-84/+286
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge "Use module resources in NetworkNotificationManager." into sc-dev	TreeHugger Robot	2021-03-19	2	-1/+26
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Use module resources in NetworkNotificationManager.	Lorenzo Colitti	2021-03-20	2	-1/+26
* \| \| \| \| \| \| \| \|	Merge "[NS03] Mix in other CS-managed properties" am: e07e3856da am: 33bed027...	Chalard Jean	2021-03-19	3	-1/+136
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge "[NS03] Mix in other CS-managed properties"	Chalard Jean	2021-03-19	3	-1/+136
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	[NS03] Mix in other CS-managed properties	Chalard Jean	2021-03-19	3	-1/+136
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge "Reland "Add an API to listen for changes in network blocked status of ...	Treehugger Robot	2021-03-19	1	-46/+31
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Reland "Add an API to listen for changes in network blocked status of an uid."	Sudheer Shanka	2021-03-18	1	-46/+31
\| * \| \| \| \| \| \| \|	Merge "Revert "Add an API to listen for changes in network blocked status of ...	Anthony Stange	2021-03-18	1	-31/+46
\| \|\\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Revert "Add an API to listen for changes in network blocked status of an uid."	Anthony Stange	2021-03-18	1	-31/+46
* \| \| \| \| \| \| \| \|	Merge changes from topic "replaceUidRange" into sc-dev	Chiachang Wang	2021-03-19	4	-159/+211
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Replace the usage of UidRange	Chiachang Wang	2021-03-19	4	-159/+211
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* / \| \| \| \| \| \| \|	Remove unused NetworkPolicyManagerInternal in CS	paulhu	2021-03-19	2	-10/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 0442...	Anthony Stange	2021-03-18	4	-211/+159
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"	Anthony Stange	2021-03-18	4	-211/+159
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Revert "Replace the usage of UidRange"	Anthony Stange	2021-03-18	4	-211/+159
\| * \| \| \| \| \| \|	Merge "Add an API to listen for changes in network blocked status of an uid."	Sudheer Shanka	2021-03-18	1	-46/+31
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| / / / / \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Add an API to listen for changes in network blocked status of an uid.	Sudheer Shanka	2021-03-18	1	-46/+31
\| \| \| \|_\|/ / \| \| \|/\| \| \|
* \| \| \| \| \|	Merge changes from topic "replaceUidRange" am: 1b6c0b7a30 am: 6319e35a0a am: ...	Chiachang Wang	2021-03-18	4	-159/+211
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge changes from topic "replaceUidRange"	Chiachang Wang	2021-03-18	4	-159/+211
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Replace the usage of UidRange	Chiachang Wang	2021-03-17	4	-159/+211
* \| \| \| \| \|	Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a9444e am: 630a52226f am: 6de5...	Lorenzo Colitti	2021-03-18	1	-0/+6
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge "Add a VpnManager.TYPE_VPN_OEM."	Lorenzo Colitti	2021-03-18	1	-0/+6
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add a VpnManager.TYPE_VPN_OEM.	Lorenzo Colitti	2021-03-18	1	-0/+6
\| \| \|/ / / /
* \| \| \| \| \|	Merge "Address remaining comments on aosp/1607893" am: b9650d8975 am: 5cb76b5...	Chalard Jean	2021-03-18	1	-3/+2
\|\\| \| \| \| \|
\| * \| \| \| \|	Address remaining comments on aosp/1607893	Chalard Jean	2021-03-18	1	-3/+2
* \| \| \| \| \|	resolve merge conflicts of c85aeee86ec35f9e942e02e7d13450dce47b1325 to sc-dev	Paul Hu	2021-03-18	3	-17/+19
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge "Add more connectivity module settings"	Paul Hu	2021-03-18	3	-17/+19
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Add more connectivity module settings	paulhu	2021-03-18	3	-17/+19
* \| \| \| \| \|	Merge changes I77a3efca,I2c4a37ff into sc-dev	Remi NGUYEN VAN	2021-03-18	3	-9/+45
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Migrate framework-connectivity internal resources	Remi NGUYEN VAN	2021-03-18	3	-9/+45
* \| \| \| \| \| \|	Add an API to listen for changes in network blocked status of an uid.	Sudheer Shanka	2021-03-18	1	-46/+31
\|/ / / / / /