Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,494 Commits 3 Branches 0 Tags
72733f640bbd391e7996845bc7451ad7fd7f3423
Commit Graph

430494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
72733f640b [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours am: 8a382eda66 -s ours 
am: 3dec1113ad -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I9d11d4b6c5ffff3399f90cf21a45c30fd4ebaaec
 2019-08-12 12:07:18 -07:00
Brad Ebinger
3dec1113ad [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours 
am: 8a382eda66 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: Iac7825da7163c0f2d0aebf808811922aeb0a2a21
 2019-08-12 11:55:00 -07:00
Brad Ebinger
8a382eda66 [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours 
am: 3c81a4c537 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: If8ff3a2ff8317a893d4c83c49a9cae8573726770
 2019-08-12 11:41:45 -07:00
Brad Ebinger
3c81a4c537 [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" 
am: ce98a32755 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I70e4eec7b690b80e5ec1bfb4610614030d508cb3
 2019-08-12 11:23:41 -07:00
Brad Ebinger
ce98a32755 Merge "SurfaceControl: Fix captureLayers JNI" 2019-08-12 17:46:33 +00:00
Android Build Merger (Role)
cf0eed10ff Merge "Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 am: 7e715542f5" into qt-qpr1-dev-plus-aosp 2019-08-12 15:52:27 +00:00
Dave Mankoff
15e9e0c124 Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 
am: 7e715542f5

Change-Id: I256bfccd5883469a511cd303b211092386bd666c
 2019-08-12 08:51:44 -07:00
Dave Mankoff
227ccfd9e3 Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 
am: 5606325ee3

Change-Id: I4990045977816f0f8e7ad29d95a647a5d9ca3aa0
 2019-08-12 08:51:42 -07:00
Dave Mankoff
5606325ee3 Merge "Disable falsing manager when face-authed." into qt-r1-dev 
am: 9249d828a1

Change-Id: I6c153ec1809d07b2e5ede1738bacc48e57d7b9cc
 2019-08-12 08:41:34 -07:00
Dave Mankoff
7e715542f5 Merge "Disable falsing manager when face-authed." into qt-r1-dev 
am: 9249d828a1

Change-Id: Icfba07cedf942e13c2a5747890b253e6f6d588c0
 2019-08-12 08:41:30 -07:00
Dave Mankoff
9249d828a1 Merge "Disable falsing manager when face-authed." into qt-r1-dev 2019-08-12 15:17:39 +00:00
Sungsoo Lim
8cbdd3af0c Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed am: ec955bbf91 
am: e823655a9d

Change-Id: If72c520c079eaf5134beb1054caa12e0bc93172f
 2019-08-11 22:12:11 -07:00
Sungsoo Lim
e823655a9d Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed 
am: ec955bbf91

Change-Id: I2981fe6d00fcc270a31f5baed59d42e0a9eccedf
 2019-08-11 22:01:15 -07:00
Bill Yi
b4df05315d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: eb16f029ee -s ours 
am: 000a882ba3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie050b98a20156ea1f9a6514771ce4b99f45737be
 2019-08-11 22:01:10 -07:00
Android Build Merger (Role)
8b5ab1e375 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours am: e8b96c4515 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-12 04:52:42 +00:00
Sungsoo Lim
ec955bbf91 Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 
am: c91d1ea7ed

Change-Id: Ie6488ec655be821bbb17c44796a4f49583471888
 2019-08-11 21:51:43 -07:00
Bill Yi
61ad55abaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours 
am: e8b96c4515 -s ours
am skip reason: subject contains skip directive

Change-Id: If566354c93dd7e8d13bd88e30fddd574097b1ed6
 2019-08-11 21:51:39 -07:00
Bill Yi
000a882ba3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: eb16f029ee -s ours
am skip reason: subject contains skip directive

Change-Id: I6a695b9f3f33b26f480d94195bafc08cf823f6c0
 2019-08-11 21:51:38 -07:00
Bill Yi
adac5c7476 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours 
am: 70ed26b986 -s ours
am skip reason: subject contains skip directive

Change-Id: I985da4431c28dd4f64059d1e95e04df0f330e5ba
 2019-08-11 21:51:37 -07:00
Bill Yi
70ed26b986 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: a6e7345636 -s ours
am skip reason: subject contains skip directive

Change-Id: Iccd8a20d4268b2de81f006ed55daaa2c4d64237f
 2019-08-11 21:41:42 -07:00
Bill Yi
e8b96c4515 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: a6e7345636 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d5193e298818d94425d28492caaafcf4d6ea295
 2019-08-11 21:41:39 -07:00
Sungsoo Lim
c91d1ea7ed Merge "Fix reference leak on TvInputHardwareManager" 
am: 8b578c9c92

Change-Id: I7fb3e249c5ae0102d61783b6bd2e70a823297a94
 2019-08-11 21:32:00 -07:00
Bill Yi
eb16f029ee [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 8931739c16 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4e3cf77ac0c63458cb1c773f97199f702815dda
 2019-08-11 21:31:53 -07:00
Bill Yi
a6e7345636 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 8931739c16 -s ours
am skip reason: subject contains skip directive

Change-Id: I968bb1d6987ac3baab44a20b642ef4196026a408
 2019-08-11 21:31:51 -07:00
Sungsoo Lim
8b578c9c92 Merge "Fix reference leak on TvInputHardwareManager" 2019-08-12 04:02:56 +00:00
TreeHugger Robot
8931739c16 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-08-12 04:00:48 +00:00
Bill Yi
5de36290c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: d47951389d -s ours
am skip reason: subject contains skip directive

Change-Id: Id40f9931776211a914c0cdf6431d988bda44ddd2
 2019-08-11 19:20:40 -07:00
Kyeongkab.Nam
741db323d9 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 am: 41c9e7092e am: 4b98ce6898 
am: bb3c59e776

Change-Id: I8b84cbaceae238201ef65cfd4168def364e66d4e
 2019-08-11 19:09:26 -07:00
Kyeongkab.Nam
bb3c59e776 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 am: 41c9e7092e 
am: 4b98ce6898

Change-Id: I5223b955c9641018fd9dd88aca62782f62fa54df
 2019-08-11 18:59:23 -07:00
Kyeongkab.Nam
4b98ce6898 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 
am: 41c9e7092e

Change-Id: I27966dd0d709e66a624ee1fc1b5045132a24385b
 2019-08-11 18:49:12 -07:00
TreeHugger Robot
d47951389d Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-08-12 01:47:33 +00:00
Kyeongkab.Nam
41c9e7092e Merge "Fix a lock issue in AudioPortEventHandler" 
am: 0985eea389

Change-Id: If2113f4150e35c7aeb1751181dab8aa2ea05dee4
 2019-08-11 18:38:44 -07:00
Treehugger Robot
0985eea389 Merge "Fix a lock issue in AudioPortEventHandler" 2019-08-12 01:22:58 +00:00
Robert Carr
1fb99f259f SurfaceControl: Fix captureLayers JNI 
Missed a call-point in last refactoring.

Bug: 135965618
Bug: 130211665
Bug: 133054270
Test: Manual
Merged-In: I43fa93eea7d79f5b773497e3bb65750866eca2cb
Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb
(cherry picked from commit bf9298f1c9)
 2019-08-09 23:50:04 +00:00
Nicholas Sauer
99a2534b07 Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev 
am: 1a89a00e8c

Change-Id: Ie69c81742f37fce541adbc82461a1cfbc85bd1ff
 2019-08-09 16:34:02 -07:00
Nicholas Sauer
1a89a00e8c Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev 2019-08-09 23:19:57 +00:00
Ned Burns
0ba5ab167f [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 am: 12201c4bf7 -s ours 
am: c18c9f3ce3 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I2ebb58ff022240d8a78cf96f35442d2a595aa428
 2019-08-09 16:12:10 -07:00
Android Build Merger (Role)
a25a7d401b Merge "[automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours am: f5933683a7 -s ours am: b309f99019 -s ours am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history" into qt-qpr1-dev-plus-aosp 2019-08-09 23:02:15 +00:00
Ned Burns
c18c9f3ce3 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 
am: 12201c4bf7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: Ib428b9deeedb3df13fe576566eddc3003ce7cd06
 2019-08-09 16:01:19 -07:00
Ned Burns
14937b2dec [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours am: f5933683a7 -s ours 
am: 0bf54bccd7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I79064cc6d5b1f226974152e4a7d30076008fa434
 2019-08-09 16:01:18 -07:00
Ned Burns
b50a18565f [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours am: f5933683a7 -s ours 
am: b309f99019 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: Ia1410112828e0bcb9435559eaba9b77ac3c5c09b
 2019-08-09 16:01:17 -07:00
Ned Burns
0bf54bccd7 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours 
am: f5933683a7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I1f3818b203591b5644b4def1db594fb029830487
 2019-08-09 15:51:53 -07:00
Ned Burns
b309f99019 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours 
am: f5933683a7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I4bc83566bc49413e69d3da3af0a7bbf83e55b491
 2019-08-09 15:49:53 -07:00
Ned Burns
12201c4bf7 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev 
am: 68f3bb1305

Change-Id: I3be328270ff02d94e626be62f27f569fb940e2de
 2019-08-09 15:38:06 -07:00
Ned Burns
f5933683a7 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev 
am: 68f3bb1305 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I37cdb13b72ac7c4da5df1db6ee07209ed20353db
 2019-08-09 15:38:03 -07:00
Sunny Goyal
8897c5edc3 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am: 2862d538b6 
am: ffe8886cd3

Change-Id: I0f8a7ac95193789a7013e7d96afb79149490384c
 2019-08-09 15:38:01 -07:00
Sunny Goyal
451b1b6d74 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am: 2862d538b6 
am: e1f7db92da

Change-Id: Ia6decd28973d4c55bbb26fc97403357940386945
 2019-08-09 15:27:52 -07:00
Bill Yi
52dc53c2d8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic9922a76ee09256ee0539d53d4c527911a869325
 2019-08-09 15:27:03 -07:00
Ned Burns
68f3bb1305 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev 2019-08-09 22:21:45 +00:00
Sunny Goyal
e1f7db92da Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev 
am: 2862d538b6

Change-Id: I907985ee2898dbe4a8e5a522934c8e4e332edca0
 2019-08-09 15:18:38 -07:00