Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
438,392 Commits 3 Branches 0 Tags
b52dfe672fe7439022d9bd54f6f3c1c653ceaed6
Commit Graph

438392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jayachandran Chinnakkannu
b52dfe672f Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" am: 4257da213d 
am: d6900e4b3c

Change-Id: I86c741f7ede242568aab436f673000c9f0da5813
 2019-11-22 10:22:02 -08:00
Ytai Ben-tsvi
dd682aacaf Merge changes from topic "hidl-memory-java" am: 887aa66d0a 
am: e74637df68

Change-Id: I475fdc72808a6d5767f09ac1f1796ef511696696
 2019-11-22 10:16:39 -08:00
Jayachandran Chinnakkannu
d6900e4b3c Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" 
am: 4257da213d

Change-Id: Iadaa0efcbc4ee9f5cecca4140132009044ba8503
 2019-11-22 10:15:56 -08:00
Ytai Ben-tsvi
e74637df68 Merge changes from topic "hidl-memory-java" 
am: 887aa66d0a

Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b
 2019-11-22 10:10:44 -08:00
Jayachandran Chinnakkannu
4257da213d Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" 2019-11-22 17:54:23 +00:00
Ytai Ben-tsvi
887aa66d0a Merge changes from topic "hidl-memory-java" 
* changes:
  Add HidlMemoryUtil
  Add parceling support for HIDL memory in Java
 2019-11-22 17:54:06 +00:00
Paul Lawrence
e750086748 [automerger skipped] Merge "Use mContext directly, and enforce via logging" am: afb2c9e9cc -s ours 
am: 3d3f98c5fe -s ours
am skip reason: change_id Iaceec82d4716837158d1233400b4a44cbf67a5e8 with SHA1 8c7f0100c7 is in history

Change-Id: I2736b1a0a79fffb0aaa006fc548103285e39b47d
 2019-11-22 09:36:43 -08:00
Paul Lawrence
3d3f98c5fe [automerger skipped] Merge "Use mContext directly, and enforce via logging" 
am: afb2c9e9cc -s ours
am skip reason: change_id Iaceec82d4716837158d1233400b4a44cbf67a5e8 with SHA1 8c7f0100c7 is in history

Change-Id: I3afb6208c45e434fa76ae736f05c6033d6cb4707
 2019-11-22 09:29:42 -08:00
Paul Lawrence
afb2c9e9cc Merge "Use mContext directly, and enforce via logging" 2019-11-22 17:19:38 +00:00
David Castro
1294b8b570 Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev am: 3b74a86752 am: 3a6d5555cd 
am: 56be7c0b58

Change-Id: I8ee35a24fc7fe2549e7a7a2c0875c0ea24e32476
 2019-11-22 09:09:15 -08:00
David Castro
56be7c0b58 Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev am: 3b74a86752 
am: 3a6d5555cd

Change-Id: I7684da1e104dac4f62ed3a7ef3f928c1598509aa
 2019-11-22 09:02:02 -08:00
Jovana Knezevic
be80fc48df Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev 
am: d7353d5c33

Change-Id: I37a5f7edc56db4ac33a9ad8a1ea43354c2abd655
 2019-11-22 08:55:27 -08:00
David Castro
3a6d5555cd Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev 
am: 3b74a86752

Change-Id: I2b5e70ef834a0d0f4ccc3689d036321094a24170
 2019-11-22 08:55:24 -08:00
Jovana Knezevic
d7353d5c33 Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev 2019-11-22 16:50:18 +00:00
TreeHugger Robot
3b74a86752 Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev 2019-11-22 16:48:36 +00:00
David Castro
0f97261406 Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev am: 716edf3883 am: a9a4771159 
am: b563d173d2

Change-Id: Iac5a860e2ad80ebb4854751de0820b33df7dc113
 2019-11-22 08:39:56 -08:00
Kenny Root
93ea22120c Merge "Make RecoverySystemService more testable" am: 49af39e751 
am: 1b506101de

Change-Id: Iae3938bb6cb9703e79bc0836b8e85f82de025c26
 2019-11-22 08:33:14 -08:00
David Castro
b563d173d2 Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev am: 716edf3883 
am: a9a4771159

Change-Id: I5a4721a39690604cacbe4fb577a5c5e14e4fd104
 2019-11-22 08:33:01 -08:00
Kenny Root
1b506101de Merge "Make RecoverySystemService more testable" 
am: 49af39e751

Change-Id: I79d712e2c8739212c4a62e9db6deddf28091fafc
 2019-11-22 08:27:49 -08:00
David Castro
a9a4771159 Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev 
am: 716edf3883

Change-Id: I74463f481c599c0680c8c536eef12ac1f23e6fa0
 2019-11-22 08:25:24 -08:00
Kenny Root
49af39e751 Merge "Make RecoverySystemService more testable" 2019-11-22 16:14:38 +00:00
David Castro
716edf3883 Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev 2019-11-22 15:57:29 +00:00
Chalard Jean
eb24ef664f Merge changes I195d894e,I7069c111 am: 87ed7d7816 
am: aab1364ef9

Change-Id: Ia75369ad6b360644392766296542efa4a5fdf0ce
 2019-11-22 06:33:34 -08:00
Chalard Jean
aab1364ef9 Merge changes I195d894e,I7069c111 
am: 87ed7d7816

Change-Id: I8e41058df03284ca677bf67930c5702d7d6c63bb
 2019-11-22 06:27:42 -08:00
Andrei-Valentin Onea
0c990f464c [automerger skipped] Merge "Add metrics constant for platform compat UI." am: 48bb84c619 -s ours 
am: c86bfb3390 -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 053191eae2 is in history

Change-Id: Ie728181b858edf80c8584c34fd0aa0b99c96d358
 2019-11-22 06:12:48 -08:00
Chalard Jean
87ed7d7816 Merge changes I195d894e,I7069c111 
* changes:
  [NS A10] Cleanup
  [NS A09] Always rematch all networks to requests
 2019-11-22 14:08:09 +00:00
Andrei-Valentin Onea
c86bfb3390 [automerger skipped] Merge "Add metrics constant for platform compat UI." 
am: 48bb84c619 -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 e9e83a5554 is in history

Change-Id: I3e8019aadb2d50eca520643d541926b35d26d231
 2019-11-22 06:06:46 -08:00
Govinda Wasserman
4b63818b1f Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev 
am: f924933058

Change-Id: Ib2c9ae43c276523b79975bbdfbfc82c6553800ba
 2019-11-22 06:06:43 -08:00
Govinda Wasserman
f924933058 Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev 2019-11-22 13:27:32 +00:00
Andrei-Valentin Onea
48bb84c619 Merge "Add metrics constant for platform compat UI." 2019-11-22 13:02:44 +00:00
Aaron Huang
d78b2a0b67 Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b 
am: 4082917f46

Change-Id: I9ef7325d73b1df9b1a3eb32e419e4cd1caeb7729
 2019-11-22 01:47:14 -08:00
Aaron Huang
4082917f46 Merge "Expose IpConfiguration and ProxyInfo APIs" 
am: 920a4a5b1b

Change-Id: I7fa9b282ca87f0c442e267acb8424f6aeed5d3a0
 2019-11-22 01:40:49 -08:00
Aaron Huang
920a4a5b1b Merge "Expose IpConfiguration and ProxyInfo APIs" 2019-11-22 09:25:16 +00:00
Remi NGUYEN VAN
37ccd4c2e3 Merge "Move shared packages to NetworkStack project" am: 27253f29ad 
am: 8a72e3d3b4

Change-Id: Ic8c7e0f83bea2d07ef359ba77b5d65829221a18d
 2019-11-21 23:22:11 -08:00
Remi NGUYEN VAN
8a72e3d3b4 Merge "Move shared packages to NetworkStack project" 
am: 27253f29ad

Change-Id: I17068de9e9b4388b8ec025ce3e1dc722e471ccbb
 2019-11-21 23:15:29 -08:00
Remi NGUYEN VAN
27253f29ad Merge "Move shared packages to NetworkStack project" 2019-11-22 06:50:22 +00:00
David Castro
d52dd84fbf Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 am: 0c8d339950 
am: b69d94a847

Change-Id: I5b22d3a71f4b12d0695f45f4ced45f633c271030
 2019-11-21 20:04:05 -08:00
Hai Shalom
f8a5719cfc Merge "Revert submission" into qt-qpr1-dev 
am: 65c9665125

Change-Id: Id444c3a9c767de5144ee2ded8f4c1cabca304670
 2019-11-21 19:57:39 -08:00
David Castro
b69d94a847 Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 
am: 0c8d339950

Change-Id: Iee45bfe51ead8d45eeccf7c0e362910f1ea59757
 2019-11-21 19:53:56 -08:00
David Castro
0c8d339950 Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev 
am: e3681d08e9

Change-Id: I927aa4ba7b60bc30de3588dafadc62c9c17109f4
 2019-11-21 19:47:23 -08:00
Hai Shalom
65c9665125 Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:01 +00:00
David Castro
e3681d08e9 Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev 2019-11-22 03:36:51 +00:00
cncn
689403c3d5 Merge "Make Notification.Builder.SetFlag public" am: c8bd4aecb3 
am: dca2d45630

Change-Id: I705e0967e993237d9f1ac2b276e66fab2422f098
 2019-11-21 18:51:47 -08:00
cncn
dca2d45630 Merge "Make Notification.Builder.SetFlag public" 
am: c8bd4aecb3

Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b
 2019-11-21 18:41:27 -08:00
Beverly
72594630e2 [automerger skipped] Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev 
am: d6dfaf4c9d -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 3fe3e8195a is in history

Change-Id: I297ae155044ca082cf1fb3002e2dcd0ce2281a82
 2019-11-21 18:39:00 -08:00
Abhijoy Saha
ab50acdbdf Merge "DO NOT MERGE Initialize VolumeUI when volume change event is received." into qt-qpr1-dev 
am: 8d11d8ca51

Change-Id: I661a33c035b4397c0f746f51acc43328382e88bc
 2019-11-21 18:32:30 -08:00
Abhijoy Saha
1e1c4df734 DO NOT MERGE Initialize VolumeUI when volume change event is received. 
am: 5d45afee03

Change-Id: I1bdbeea557aca35b20972dd4f4205fb29a049a7d
 2019-11-21 18:32:25 -08:00
TreeHugger Robot
d6dfaf4c9d Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev 2019-11-22 00:51:41 +00:00
Jayachandran C
c5ba7200d4 Remove usage of hidden API Emoji.isRegionalIndicatorSymbol 
This CL copies the logic in the local file

Bug: 140908357
Test: Build
Change-Id: I1044c456fdf6ad1646811c966e0cd38c67665ad9
 2019-11-21 16:49:46 -08:00
Treehugger Robot
c8bd4aecb3 Merge "Make Notification.Builder.SetFlag public" 2019-11-22 00:39:10 +00:00