Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
483,149 Commits 3 Branches 0 Tags
78a7bcaf824264bd60849b07e293796b8109ce06
Commit Graph

483149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
78a7bcaf82 Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7bd 
Change-Id: I2b96736072392f0a49e38eb3d494f167064126ff
 2020-04-29 09:39:22 +00:00
Oli Lan
87193786f0 Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670 
Change-Id: I674d84447e613a73508f610818c0506af0121608
 2020-04-29 09:38:51 +00:00
Oli Lan
bea593f083 Record supported extension versions at rollback creation. am: 2986572ae8 
Change-Id: Ia31d94e090a62c8324d3f4f42e8cf804ea2407cc
 2020-04-29 09:38:42 +00:00
Chiachang Wang
5e0437f1e2 Merge changes I3525edc3,I6e18915e am: c861b10841 am: 31f2f386ce 
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
 2020-04-29 09:24:10 +00:00
TreeHugger Robot
edea65c7bd Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev 2020-04-29 09:23:11 +00:00
Oli Lan
266fba1670 Merge changes I7fd7d98a,If770a615 into rvc-dev 
* changes:
  Block rollback commit if it may violate min extension constraint.
  Record supported extension versions at rollback creation.
 2020-04-29 09:16:12 +00:00
Chiachang Wang
31f2f386ce Merge changes I3525edc3,I6e18915e am: c861b10841 
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
 2020-04-29 09:08:45 +00:00
Riddle Hsu
8bf136448f Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d091c 
Change-Id: Ia8b888d4d5d5cd6f33078acd5fcb78c4acf3ce5a
 2020-04-29 08:50:20 +00:00
Chiachang Wang
c861b10841 Merge changes I3525edc3,I6e18915e 
* changes:
  Filter debug entries for each vpn
  Add test prefix into test cases
 2020-04-29 08:43:02 +00:00
Riddle Hsu
33cf9d091c Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev 
* changes:
  Clear fixed rotation if display config does not change
  Polish fixed rotated recents animation
  Extensive handling of fixed rotation launching app
 2020-04-29 08:32:47 +00:00
Tracy Zhou
3965460489 Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 
Change-Id: If54ca2c15126212c7c4e2009fe324754399ae946
 2020-04-29 08:21:01 +00:00
Tracy Zhou
e13fab2d48 Merge "Add pebble shape to Android.mk" into rvc-dev 2020-04-29 08:05:19 +00:00
Fiona Campbell
77b0d5d7c3 Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 
Change-Id: I4dd31205beb44037fdea6082f4c1d0a3e4210c42
 2020-04-29 07:52:20 +00:00
Fiona Campbell
700c810706 Merge "Add lights HAL to watchdog" into rvc-dev 2020-04-29 07:30:12 +00:00
Chiachang Wang
34bbc85569 Filter debug entries for each vpn 
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.

Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
      and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
 2020-04-29 15:07:45 +08:00
TreeHugger Robot
fb79f914af Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 
Change-Id: I6d9654326dd00d287470c4260cba03e5aba1d66b
 2020-04-29 06:28:01 +00:00
TreeHugger Robot
6b6cf16740 Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev 2020-04-29 06:11:52 +00:00
TreeHugger Robot
e1516315da Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe 
Change-Id: If2d1e9f96fcdf103a38934203753170205c76c5d
 2020-04-29 05:59:48 +00:00
TreeHugger Robot
447914fcfe Merge "Add RoleControllerManagerTest." into rvc-dev 2020-04-29 05:56:34 +00:00
Chiachang Wang
8563394015 Add test prefix into test cases 
Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
Change-Id: I6e18915e383ac20072cb238d0136d7a8e4ceb811
 2020-04-29 13:44:50 +08:00
Tracy Zhou
d617c8c825 Add pebble shape to Android.mk 
Fixes: 155249319
Test: manual
Change-Id: If0a291afa8ee97b4109ddd08c27c6708f6bceb0a
 2020-04-28 22:43:28 -07:00
Tracy Zhou
0602525c75 Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 
Change-Id: I0b0ad731d0c5f0cfc496846a3622b42bc0a11e4e
 2020-04-29 05:40:35 +00:00
Tracy Zhou
1bad463073 Merge "Update icon shape for Sam" into rvc-dev 2020-04-29 05:35:51 +00:00
TreeHugger Robot
eb284a2bcb Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe 
Change-Id: I2227d9816e5bdbf38fdbbf2e0188b6ff1df6e55c
 2020-04-29 05:33:23 +00:00
TreeHugger Robot
d3b000cafe Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
Arthur Hung
2439be67c1 Merge "Fix freeform window can't resize after maximize window and restore" into rvc-dev am: 05e4028d77 
Change-Id: I77cd66d4bfc5f76b75238f95710e6c3c6075ae25
 2020-04-29 04:44:39 +00:00
Arthur Hung
05e4028d77 Merge "Fix freeform window can't resize after maximize window and restore" into rvc-dev 2020-04-29 04:24:47 +00:00
PETER LIANG
f2aae1f829 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a80 
Change-Id: Idb809129577af1d0d75eaacf6e9bc8a3acdf2676
 2020-04-29 04:11:37 +00:00
Rob Carr
4bc809a6f4 Merge "BLAST: Avoid JNI call on creation" into rvc-dev am: 6fcbf83d5e 
Change-Id: I41a76c76507e0f72a3ff8ab9699185f1e66eff81
 2020-04-29 04:11:15 +00:00
Kevin Chyn
d74bd74410 Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662ed 
Change-Id: Ie3fdc8ecf7b80d25a52691b1cae2e659696d821a
 2020-04-29 04:10:50 +00:00
Treehugger Robot
d0ec55625d Merge "Make me an owner of accessibility frameworks" am: 5a0d2aa4ba am: 20bee3e6de 
Change-Id: I4a695d7feaefae2640bf7f1a25bc46a144ae3582
 2020-04-29 04:10:33 +00:00
PETER LIANG
c463e56a80 Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev 2020-04-29 04:08:36 +00:00
Rob Carr
6fcbf83d5e Merge "BLAST: Avoid JNI call on creation" into rvc-dev 2020-04-29 03:59:14 +00:00
Treehugger Robot
20bee3e6de Merge "Make me an owner of accessibility frameworks" am: 5a0d2aa4ba 
Change-Id: If91e461c8a75e329526eb86ede1ca33bcc5312ab
 2020-04-29 03:56:52 +00:00
Kevin Chyn
90b27662ed Merge "Check for null HAT and add logging" into rvc-dev 2020-04-29 03:53:35 +00:00
Treehugger Robot
5a0d2aa4ba Merge "Make me an owner of accessibility frameworks" 2020-04-29 03:37:54 +00:00
TreeHugger Robot
a13f1f1dfa Merge "Compute visibilities when finishing activity with a translucent resume activity" into rvc-dev am: 32729dacab 
Change-Id: If60e0e6f4f84df4f17e7c787501238ec08da8a7b
 2020-04-29 02:56:04 +00:00
Isaac Chen
284735d378 [automerger skipped] Merge "Enable System User Home for CSI" am: c27232bf33 am: 316255b845 -s ours 
am skip reason: Change-Id I0f999f76e23c6316f6d5d0741a1116028e34a0ab with SHA-1 fd2f5f66f9 is in history

Change-Id: I5f2de1ed42577fa0cfce634ef343c18f6fddc5b1
 2020-04-29 02:55:34 +00:00
TreeHugger Robot
32729dacab Merge "Compute visibilities when finishing activity with a translucent resume activity" into rvc-dev 2020-04-29 02:40:14 +00:00
Isaac Chen
316255b845 Merge "Enable System User Home for CSI" am: c27232bf33 
Change-Id: Ifbc1b313094c36baaa126d02be5c3ee0e00fe831
 2020-04-29 02:40:07 +00:00
Isaac Chen
c27232bf33 Merge "Enable System User Home for CSI" 2020-04-29 02:19:12 +00:00
Tracy Zhou
165e592e14 Update icon shape for Sam 
And rename it to Vessel

Fixes: 153277903
Test: Manual
Change-Id: I63ffffce5162ba7ad59c1beb7a89e924b40e4454
 2020-04-28 19:10:42 -07:00
TreeHugger Robot
09e8c5e4e7 Merge "Address leftover TODOs from inline suggestions." into rvc-dev am: 13d7838088 
Change-Id: I4d07ac8b0974d8a332686e7cb691fe1fd361c506
 2020-04-29 02:01:15 +00:00
TreeHugger Robot
13d7838088 Merge "Address leftover TODOs from inline suggestions." into rvc-dev 2020-04-29 01:46:47 +00:00
TreeHugger Robot
1e0ddb4d4c Merge "Resolve IndexOOBException in SigningDetails#hasAncestor" into rvc-dev am: 8ba4e7599a 
Change-Id: I28c7f11a4e940435fa5d6cd44567409fdcd152f4
 2020-04-29 01:28:52 +00:00
TreeHugger Robot
1b1edc944e Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev am: 007a73c551 
Change-Id: Idae467e9a9bb17174251dfa8960b0133be998b26
 2020-04-29 01:28:13 +00:00
TreeHugger Robot
8ba4e7599a Merge "Resolve IndexOOBException in SigningDetails#hasAncestor" into rvc-dev 2020-04-29 01:21:27 +00:00
TreeHugger Robot
007a73c551 Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev 2020-04-29 01:09:32 +00:00
Kevin Chyn
412bd81933 Move ImeAwareTextEdit from Settings to android.widget 
Also use it for AuthCredentialPasswordView

Bug: 154161590

Test: BiometricPromptDemo, authenticate with password
Change-Id: I17601848dd9be3d0580988e3ff613c3793dfed51
 2020-04-28 18:06:25 -07:00
TreeHugger Robot
ac88990ef2 Merge "Enable edge gesture if quickstep has never started" into rvc-dev am: a1f9485de2 
Change-Id: I3d3345bf7f998eb339c6d1648339544a15afec7e
 2020-04-29 00:23:53 +00:00