Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468,820 Commits 3 Branches 0 Tags
aa1ed58457ec0f7d167f188213b00e750fea44b8
Commit Graph

468820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
aa1ed58457 Merge "Remove key from adb_keys if user forgets the key." into rvc-dev am: b76d7aa6bc am: 903113ebc4 
Change-Id: I4ea87f6d4bb9886a710f098ad3a519522c188c3d
 2020-02-25 06:29:14 +00:00
Automerger Merge Worker
903113ebc4 Merge "Remove key from adb_keys if user forgets the key." into rvc-dev am: b76d7aa6bc 
Change-Id: I935b7d725fb38079a77412e14333c900d5025d6f
 2020-02-25 06:19:14 +00:00
Joshua Duong
b76d7aa6bc Merge "Remove key from adb_keys if user forgets the key." into rvc-dev 2020-02-25 06:10:49 +00:00
Automerger Merge Worker
d036bebf39 Merge "Introduce SoftInputShowHideHistory" into rvc-dev am: 20ea7f5258 am: 36a9db1b2f 
Change-Id: Idacfce4f40d3a3d3b4754b52f4bddd63323d809b
 2020-02-25 05:56:16 +00:00
Automerger Merge Worker
b9476b6ca4 Merge "Introduce SoftInputShowHideHistory" into rvc-dev am: 20ea7f5258 am: ea9af3b3f7 
Change-Id: If7ce331a85371636f2294d87be1571fabe1712e1
 2020-02-25 05:55:57 +00:00
Automerger Merge Worker
ea9af3b3f7 Merge "Introduce SoftInputShowHideHistory" into rvc-dev am: 20ea7f5258 
Change-Id: I0cb1690564f7b65f58a7c487e4f44a2f5e422767
 2020-02-25 05:44:20 +00:00
Automerger Merge Worker
36a9db1b2f Merge "Introduce SoftInputShowHideHistory" into rvc-dev am: 20ea7f5258 
Change-Id: Ie4ae10b4af4b3e225bb7d37369aa92433cd8c5f0
 2020-02-25 05:44:19 +00:00
TreeHugger Robot
20ea7f5258 Merge "Introduce SoftInputShowHideHistory" into rvc-dev 2020-02-25 05:35:25 +00:00
Automerger Merge Worker
9f69389a40 Merge "Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897 am: 7ffe47083b" into rvc-d1-dev-plus-aosp 2020-02-25 05:28:41 +00:00
Automerger Merge Worker
622fc4f4c8 Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897 am: 7ffe47083b 
Change-Id: If2f9c8ac5dc7a888e74e908de38e73f9965d7239
 2020-02-25 05:28:34 +00:00
Automerger Merge Worker
3711878298 Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897 am: 5e81308738 
Change-Id: I0700da2f676043ad8a1dfde7ce5755251776f87f
 2020-02-25 05:28:29 +00:00
Automerger Merge Worker
5e81308738 Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897 
Change-Id: Ie2e037adf18ab2b57ab650e14dea19b271ee2049
 2020-02-25 05:17:58 +00:00
Automerger Merge Worker
7ffe47083b Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897 
Change-Id: I2da5c620d9b7b69d3e37200fd14429f3a08ff1f9
 2020-02-25 05:17:41 +00:00
Automerger Merge Worker
da7c3a0ee0 Merge "Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0 am: b08d9160a2" into rvc-d1-dev-plus-aosp 2020-02-25 05:03:53 +00:00
Automerger Merge Worker
e308b9d1aa Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0 am: b08d9160a2 
Change-Id: I0cf3b809e60c36ce33e0ca206d991e73acc00970
 2020-02-25 05:03:48 +00:00
Automerger Merge Worker
7e9adeded0 Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0 am: 28d79c4c4c 
Change-Id: I1e9fbb0ec0351e94f93c2384878856e2777a0c90
 2020-02-25 05:03:45 +00:00
Amy Zhang
7ff127e897 Merge changes from topic "trm-impl-rvc" into rvc-dev 
* changes:
  Fix issues in register/unregister client API implementation
  Add a TRM use case priority hints info object
  Add requestFrontend implementation in TunerResourceManager
  Implement TRM setFrontendInfoList logic with unit tests
 2020-02-25 05:02:44 +00:00
Automerger Merge Worker
b08d9160a2 Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0 
Change-Id: Id9ecfe73a5a2fae9ae16044459ff9236f6f0d0df
 2020-02-25 04:51:55 +00:00
Automerger Merge Worker
28d79c4c4c Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0 
Change-Id: I3271aba62a790c04366b13fcd682b6fbe6fd7c58
 2020-02-25 04:51:37 +00:00
TreeHugger Robot
67c02e6cb0 Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev 2020-02-25 04:43:08 +00:00
Automerger Merge Worker
9dec5d8fbf Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev am: d44e0e38e3 am: f083faa2ca 
Change-Id: I56295739c20566f32cb8159e7bd4fcfc7fb478f8
 2020-02-25 04:40:49 +00:00
Automerger Merge Worker
18a61e6b0e Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4 am: 45bfafd874 
Change-Id: Id1ad9bdd2650e12cd4665201b65474a06168f71a
 2020-02-25 04:40:44 +00:00
Automerger Merge Worker
b9c5d2f694 Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev am: d44e0e38e3 am: fc107deeb0 
Change-Id: Ia26505be061e81e4ea93b4b02acaa19cac823beb
 2020-02-25 04:40:38 +00:00
Automerger Merge Worker
d06976e6ac Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4 am: a75ac70422 
Change-Id: Icc4882dd7631617cc41d3182256a1d37a7fd9d96
 2020-02-25 04:40:32 +00:00
Automerger Merge Worker
f083faa2ca Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev am: d44e0e38e3 
Change-Id: Icd409112be6dbb03331c2d3a536df91b0951ab91
 2020-02-25 04:30:52 +00:00
Automerger Merge Worker
fc107deeb0 Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev am: d44e0e38e3 
Change-Id: If06a4ede819db39985cb39fef4f895b63135c890
 2020-02-25 04:30:33 +00:00
Automerger Merge Worker
45bfafd874 Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4 
Change-Id: I682d01f80318d832f163b3de69df26ec29cf4a22
 2020-02-25 04:30:26 +00:00
Automerger Merge Worker
a75ac70422 Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4 
Change-Id: Ie057e52315916f195f1308af8fd4d1fa1338597a
 2020-02-25 04:30:14 +00:00
TreeHugger Robot
d44e0e38e3 Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev 2020-02-25 04:29:32 +00:00
TreeHugger Robot
395262cbb4 Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev 2020-02-25 04:21:02 +00:00
Automerger Merge Worker
3047f12346 Merge changes I4a624ea4,I8626932e am: d813aaa279 am: a081a0cbab am: 3384bb9a4d 
Change-Id: Id6c92b565e1f7573ee25cdc785934a8ef4c3121c
 2020-02-25 04:17:54 +00:00
Automerger Merge Worker
6ef8f80c19 Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" am: c779bbce18 am: 3a4324ef8b am: fa5d126f77 
Change-Id: I36ceb45e4fc05404ca5a0f616cd53bb8522dbcd7
 2020-02-25 04:17:47 +00:00
Automerger Merge Worker
eb00234651 Merge "Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4" into rvc-dev-plus-aosp am: 6e05f1066e 
Change-Id: I1f5e94945574c229aafe58f86aec2a837c01fee9
 2020-02-25 04:17:26 +00:00
Automerger Merge Worker
bd947f7b3b [automerger skipped] Merge "Fix Race Condition" am: 1d9f60bccc am: 43bfaf2fda -s ours am: 1812ec2f2b -s ours 
am skip reason: Change-Id I04ae2f7ed025f5ce8bc4fdeb7f10717e20d76282 with SHA-1 9ec159ac1f is in history

Change-Id: Id7ca117677f3a88757404112e823b319a2a1441f
 2020-02-25 04:17:02 +00:00
Automerger Merge Worker
f2bc0f5b57 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: 4a7aa0b231 
Change-Id: I36e79f35c297261b19a58cc76dffad5f52172f1c
 2020-02-25 04:16:52 +00:00
Automerger Merge Worker
0a0c7e1f89 Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 am: 741e10f167 
Change-Id: Ic2345d59c0073c2996fe019a7b8c8c0d1c52e534
 2020-02-25 04:16:39 +00:00
Automerger Merge Worker
3384bb9a4d Merge changes I4a624ea4,I8626932e am: d813aaa279 am: a081a0cbab 
Change-Id: I691053b22cb0b20e49419212f378cc473b1f35dc
 2020-02-25 04:04:44 +00:00
Automerger Merge Worker
fa5d126f77 Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" am: c779bbce18 am: 3a4324ef8b 
Change-Id: If2279f6f4274b7730fa21ea9d92dfc554a736454
 2020-02-25 04:04:20 +00:00
Automerger Merge Worker
6e05f1066e Merge "Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4" into rvc-dev-plus-aosp 2020-02-25 04:04:11 +00:00
Automerger Merge Worker
e3d710cc5f Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 
Change-Id: Ieb0fa6f1a6c6f5290239304515e5740329eb0639
 2020-02-25 04:04:06 +00:00
Automerger Merge Worker
1812ec2f2b [automerger skipped] Merge "Fix Race Condition" am: 1d9f60bccc am: 43bfaf2fda -s ours 
am skip reason: Change-Id I04ae2f7ed025f5ce8bc4fdeb7f10717e20d76282 with SHA-1 9ec159ac1f is in history

Change-Id: Ia2cdc83971e498e4880e91b20430c3a8ff840716
 2020-02-25 04:04:01 +00:00
Automerger Merge Worker
4a7aa0b231 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 
Change-Id: I5e0c2e973fb79692ad245a74def946865caedfcc
 2020-02-25 04:03:45 +00:00
Automerger Merge Worker
741e10f167 Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 
Change-Id: I403fcef26ee106317c6b8bee99b8df037a9d5777
 2020-02-25 04:03:28 +00:00
Automerger Merge Worker
a081a0cbab Merge changes I4a624ea4,I8626932e am: d813aaa279 
Change-Id: I287935bd8023f13033d53bdef79a7e2027114d40
 2020-02-25 04:00:34 +00:00
Automerger Merge Worker
3a4324ef8b Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" am: c779bbce18 
Change-Id: I58cfdae8da99d505c4b4c91f53d3329a5bec0b58
 2020-02-25 04:00:06 +00:00
Automerger Merge Worker
43bfaf2fda Merge "Fix Race Condition" am: 1d9f60bccc 
Change-Id: Ia13cbf8e1afa085c09883a049d375c2916021525
 2020-02-25 03:58:54 +00:00
Automerger Merge Worker
c531ed5419 [automerger skipped] Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 47f2bf7db4 -s ours 
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb72 is in history

Change-Id: I37a0d1d9046a80b4f3526d18cbc8d40a54821e3d
 2020-02-25 03:58:37 +00:00
Automerger Merge Worker
d15abb58a5 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a 
Change-Id: I22411956eea2cb1fad18f29ac308c8539deb6bdd
 2020-02-25 03:58:07 +00:00
Lorenzo Colitti
d813aaa279 Merge changes I4a624ea4,I8626932e 
* changes:
  Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules
  Clear IPv6 forwarding rules when losing upstream or stopping.
 2020-02-25 03:54:59 +00:00
Treehugger Robot
c779bbce18 Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" 2020-02-25 03:53:41 +00:00