Commit Graph

540939 Commits

Author SHA1 Message Date
Automerger Merge Worker
4fcbe68915 Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: 091cee7eda am: e27162ad7a" into rvc-qpr-dev-plus-aosp 2020-06-19 01:41:35 +00:00
Remi NGUYEN VAN
900b7d1026 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: 091cee7eda am: e27162ad7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I79af90ded28a5bbc3f607f50947fda21fe613c34
2020-06-19 01:41:22 +00:00
Remi NGUYEN VAN
a0e6de606f Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: 091cee7eda am: 448560b25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I50b32efed3d5398346450c34afc45c6e6ab3d9f3
2020-06-19 01:41:07 +00:00
Remi NGUYEN VAN
b232961fb8 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: deae676127 am: af0fe2e715
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia943e2cdc74480ea0bbbd07478befaeefac97189
2020-06-19 01:40:35 +00:00
Remi NGUYEN VAN
e27162ad7a Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: 091cee7eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I2ec211557839533327cc747857a09bd323654ad6
2020-06-19 01:22:47 +00:00
Remi NGUYEN VAN
448560b25b Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: 091cee7eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I50db8012a9facd35176c8a5511b8245623ea315e
2020-06-19 01:22:33 +00:00
Remi NGUYEN VAN
af0fe2e715 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90 am: deae676127
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I17459fc7a4239b10b6b55412d126557719e1bd98
2020-06-19 01:22:28 +00:00
Remi NGUYEN VAN
deae676127 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Icd141a992c46290c74929785e261a1cd57bc001b
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
091cee7eda Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia5028f7dfeadbcf928efb9862b481c82e2849e18
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
6555756e90 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev 2020-06-19 00:49:29 +00:00
Automerger Merge Worker
6a893fbced Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4 am: 4675ff1d9b" into rvc-qpr-dev-plus-aosp 2020-06-19 00:07:51 +00:00
TreeHugger Robot
b97051a341 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4 am: 4675ff1d9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I8807bc2c2652fd1c64289610616af20a86c8b1a1
2020-06-19 00:07:41 +00:00
Automerger Merge Worker
b9bdd8dd50 Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4" into rvc-d1-dev-plus-aosp am: d33f341e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: Ibb9c44fbd405f0522b0af45afb0278bb2c4f9b3d
2020-06-19 00:07:34 +00:00
TreeHugger Robot
83ef0b8ed8 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858 am: dafdfb6ea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I4533af8250e0ce70b949891fa8bdb5434ae1f7e1
2020-06-19 00:07:21 +00:00
Automerger Merge Worker
d33f341e8f Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4" into rvc-d1-dev-plus-aosp 2020-06-18 23:55:47 +00:00
TreeHugger Robot
dafdfb6ea1 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I1e3165fcf852e96653f0aedef2e79093d66fd0e1
2020-06-18 23:55:29 +00:00
TreeHugger Robot
488581802f Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: Iad4638f4e13bcd5efd277bbbf63847c3e4de345e
2020-06-18 23:55:27 +00:00
TreeHugger Robot
4675ff1d9b Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I80f8635286a2642242819e2184844145661a4661
2020-06-18 23:55:19 +00:00
TreeHugger Robot
9c0ada2858 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I011f20bfa317c7f2431613769cd3567245d2a973
2020-06-18 23:39:35 +00:00
TreeHugger Robot
e66ed082a4 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I127f03003024426fbca741b5282a1b9d3d1eac42
2020-06-18 23:39:22 +00:00
TreeHugger Robot
853ee37937 Merge "Remove BubbleEntity via IDs" into rvc-dev 2020-06-18 23:26:48 +00:00
TreeHugger Robot
cf01e0005e Merge "Fix typo that leads to attention not working" into rvc-d1-dev am: 6469679e31 am: 21d2fbc5cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898400

Change-Id: I280e247caab09b0c2c12723f2f4b8952bf5c6778
2020-06-18 23:25:00 +00:00
TreeHugger Robot
36433b646f Merge "Fix typo that leads to attention not working" into rvc-d1-dev am: 6469679e31 am: 7cd082924e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898400

Change-Id: I951693aa0e8ed3049b60276dbc291e14e625d726
2020-06-18 23:24:53 +00:00
TreeHugger Robot
21d2fbc5cf Merge "Fix typo that leads to attention not working" into rvc-d1-dev am: 6469679e31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898400

Change-Id: Ia32f3a8b96f0a1cd45dc00843684d09c6303581e
2020-06-18 23:14:32 +00:00
TreeHugger Robot
7cd082924e Merge "Fix typo that leads to attention not working" into rvc-d1-dev am: 6469679e31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898400

Change-Id: I98e7afe484111e07dd96221f5da90cb6a06178e7
2020-06-18 23:14:06 +00:00
TreeHugger Robot
6469679e31 Merge "Fix typo that leads to attention not working" into rvc-d1-dev 2020-06-18 23:02:44 +00:00
TreeHugger Robot
886a1cf550 Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: 1587e4734c am: 8f0bf30d8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: I35fe05973eff6bb58a3b1457020d90e0760e81c0
2020-06-18 22:56:15 +00:00
TreeHugger Robot
8f0a1d35b2 Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: e98bf81d60 am: 8e0243f2bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: Icc0787ade0f7c393d454b6d503dfcc15227ee178
2020-06-18 22:55:50 +00:00
Automerger Merge Worker
ed3cc6640d Merge "Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4" into rvc-d1-dev-plus-aosp am: ac7516e1dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: I45301aed2429e533b90893bf89ae8ca7d27b1860
2020-06-18 22:55:18 +00:00
TreeHugger Robot
32543c38bc Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: 1587e4734c am: fcc484a393
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: Ia45107d5e9b5fa1de7c476fbe6f291b42aeff3ea
2020-06-18 22:54:35 +00:00
Automerger Merge Worker
832abad3da Merge "Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: bfaa2fed21" into rvc-d1-dev-plus-aosp am: 2f1e6f9be0" into rvc-qpr-dev-plus-aosp 2020-06-18 22:54:16 +00:00
TreeHugger Robot
4829436fc3 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4 am: f42cbc831a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: Ida5025f58156e77e427aa9f2d1649eb6a380080a
2020-06-18 22:53:59 +00:00
Automerger Merge Worker
1f797f203c Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: bfaa2fed21" into rvc-d1-dev-plus-aosp am: 2f1e6f9be0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I547ef8d62f8802ce02288dfdc915ff7b44825015
2020-06-18 22:53:58 +00:00
Automerger Merge Worker
c3a7c96aac Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449 am: 8052eb86aa" into rvc-qpr-dev-plus-aosp 2020-06-18 22:53:08 +00:00
TreeHugger Robot
4c9cdf1da4 Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449 am: 8052eb86aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I10bd2393bba1e5f0de12cd467e9b93ca64e19e4c
2020-06-18 22:52:42 +00:00
TreeHugger Robot
f053b9b12a Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449 am: b69e5095ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I4ab8ca00f6bd0df0a8a2e5ea374704be282698de
2020-06-18 22:52:35 +00:00
TreeHugger Robot
fcc484a393 Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: 1587e4734c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: I2af2497a0af099094cee7a4e23e702592bd63df8
2020-06-18 22:40:51 +00:00
TreeHugger Robot
8f0bf30d8f Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: 1587e4734c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: I2442e1bcd12ae7db2ddd20020c6986452e58f776
2020-06-18 22:40:51 +00:00
TreeHugger Robot
8e0243f2bc Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b am: e98bf81d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: I49c6e2809919656f808de44cf0d4ab608baba42b
2020-06-18 22:36:40 +00:00
TreeHugger Robot
1587e4734c Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: I4ca80343a1d8c3218c22c6cf438724514a63ce07
2020-06-18 22:36:01 +00:00
Automerger Merge Worker
ac7516e1dc Merge "Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4" into rvc-d1-dev-plus-aosp 2020-06-18 22:35:55 +00:00
TreeHugger Robot
9300ff96a3 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: I9d25209a52281020f9721b1aaafaad712a29f900
2020-06-18 22:35:49 +00:00
TreeHugger Robot
e98bf81d60 Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: Ib2ff7379d848bc65c925f588ef6d6d700a0d9549
2020-06-18 22:35:47 +00:00
Automerger Merge Worker
2f1e6f9be0 Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: bfaa2fed21" into rvc-d1-dev-plus-aosp 2020-06-18 22:35:47 +00:00
TreeHugger Robot
2198d038b4 Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: bfaa2fed21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I9c840ea69dbbc451fc6cd7f731020a9681367efa
2020-06-18 22:35:41 +00:00
TreeHugger Robot
f42cbc831a Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: I9418208460380e74aa403f4135d0df7dfc9cb224
2020-06-18 22:35:37 +00:00
TreeHugger Robot
b69e5095ef Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: Ic6cc3ea9cb286c490734690a1329bb2c36c66ce9
2020-06-18 22:35:31 +00:00
TreeHugger Robot
8052eb86aa Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I8287f8b85e868560ea50b47fbc1d87e1a6b7fcb9
2020-06-18 22:35:28 +00:00
TreeHugger Robot
8ce8c004a4 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev 2020-06-18 22:26:43 +00:00
TreeHugger Robot
19272a236b Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev 2020-06-18 22:20:38 +00:00