Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
426,450 Commits 3 Branches 0 Tags
8124aebface73f01fda0cbcf75b9edd3f5768e6b
Commit Graph

426450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
8124aebfac [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: e5039d3c9f -s ours
am skip reason: subject contains skip directive

Change-Id: I48452259f679aa7b686002569b259a9d34ca066a
 2019-06-21 17:17:31 -07:00
Amit Mahajan
0c1364eb67 Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff am: ab90035993 
am: 3d5285c16b

Change-Id: Ie40e27219cc741bdb58fc0e2ac1fa2559d34730c
 2019-06-21 16:52:17 -07:00
Amit Mahajan
3d5285c16b Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff 
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e
 2019-06-21 16:46:15 -07:00
TreeHugger Robot
e5039d3c9f Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-21 23:45:39 +00:00
Dave Mankoff
4ae5be910d Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev 
am: 0cd732ddf3

Change-Id: I8532cd2337ae7f29a7f2ac4111ac347aec470bc8
 2019-06-21 16:40:15 -07:00
Dave Mankoff
e941dd8918 DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. 
am: 84c07e9f1a

Change-Id: I5e6f899fefef4d667d867bd265873771685c0aa6
 2019-06-21 16:40:12 -07:00
Amit Mahajan
ab90035993 Merge "Set mOriginatingAddress and mRecipientAddress separately" 
am: 44ea78d8ff

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed
 2019-06-21 16:39:09 -07:00
Dave Mankoff
0cd732ddf3 Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev 2019-06-21 23:31:19 +00:00
Amit Mahajan
44ea78d8ff Merge "Set mOriginatingAddress and mRecipientAddress separately" 2019-06-21 23:23:12 +00:00
Android Build Merger (Role)
04cd81fda7 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours am: af16a228a2 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-21 22:31:39 +00:00
Bill Yi
fa90167dcb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours 
am: af16a228a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I1035374267cf948c63d087a82a46efd68f870e59
 2019-06-21 15:30:33 -07:00
Bill Yi
40ba79442f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours 
am: 772a340689 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib6d83ef3007e068d3323803ff178afd1c8302b26
 2019-06-21 15:30:17 -07:00
Android Build Merger (Role)
8f0c3ac7c6 Merge "Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 am: b3be57b74c" into qt-r1-dev-plus-aosp 2019-06-21 22:28:36 +00:00
Aran Ink
19c65b97d2 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 
am: b3be57b74c

Change-Id: I4ef494bd9d157fec7aa8e0ae13639534301b98fa
 2019-06-21 15:27:46 -07:00
Aran Ink
49a40df62a Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 
am: 43369ea648

Change-Id: I7ae7a7d7d4ad2ea593ef01c6ed03bd161b5d5d0b
 2019-06-21 15:27:42 -07:00
Bill Yi
772a340689 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: I20dde9516b31187e21f5eb90f7dce45019d1f96e
 2019-06-21 15:21:23 -07:00
Bill Yi
af16a228a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb62faea41ec53b7e9f0127f64f9e7a2c6af9f0
 2019-06-21 15:21:21 -07:00
Aran Ink
43369ea648 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 
am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1
 2019-06-21 15:18:29 -07:00
Aran Ink
b3be57b74c Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 
am: 985f21dd43

Change-Id: I9e279d5ccae2ce43a30e217bccd34df3a200285e
 2019-06-21 15:18:28 -07:00
TreeHugger Robot
019e1bf3fb Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-21 22:05:31 +00:00
TreeHugger Robot
985f21dd43 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 2019-06-21 22:00:47 +00:00
Andreas Gampe
89e543fe54 Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5 
am: e4a6ca7231

Change-Id: Ic94c92c684daeb486833a0c0ff090b1637e13b18
 2019-06-21 13:57:26 -07:00
Andreas Gampe
e4a6ca7231 Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 
am: 70ad27cfb5

Change-Id: I7c11438bd295fd973f78302550e88833c84883b5
 2019-06-21 13:52:40 -07:00
Andreas Gampe
70ad27cfb5 Merge changes Ie70d0155,I0692a91d,I8c5041a4 
am: 4507201da5

Change-Id: Iaeb7c0e3b6a7ed63518de98a11df165b753fcb6e
 2019-06-21 13:46:38 -07:00
Dave Mankoff
84c07e9f1a DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. 
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
 2019-06-21 20:43:14 +00:00
Andreas Gampe
4507201da5 Merge changes Ie70d0155,I0692a91d,I8c5041a4 
* changes:
  LockAgent: Add agent parameters to start_lock_agent script
  LockAgent: Add option to synthesize Java crash logging
  LockAgent: Add ability to generate a native crash
 2019-06-21 20:26:43 +00:00
Android Build Merger (Role)
ba65adf46b Merge "Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443 am: 46cb9bed22" into qt-r1-dev-plus-aosp 2019-06-21 19:57:20 +00:00
Lajos Molnar
54afba84dd Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443 
am: 46cb9bed22

Change-Id: I41e97c3cadf2a2696f61ae04c56fe84852fb2bfe
 2019-06-21 12:56:39 -07:00
Lajos Molnar
83cfaf6d07 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443 
am: ba0ce1d6a9

Change-Id: I3cbe81635e00586c5dcc829e1179c55bd8a54611
 2019-06-21 12:56:36 -07:00
Lajos Molnar
46cb9bed22 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev 
am: cfb6f93443

Change-Id: I4d9ba78b41b791db6119fd57fff5c053bcf82f3a
 2019-06-21 12:50:37 -07:00
Lajos Molnar
ba0ce1d6a9 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev 
am: cfb6f93443

Change-Id: I069b15b05fc1032177c4874cd7ff2d2041076e22
 2019-06-21 12:50:37 -07:00
Lajos Molnar
cfb6f93443 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev 2019-06-21 19:38:17 +00:00
Aran Ink
5590c56102 Fix conflict between metrics_constants and settings_enums. 
Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
(cherry picked from commit 08659ccdb7)
 2019-06-21 19:36:20 +00:00
Selim Cinek
7fe31c3d52 [automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c 
am: 7cfda2b91c -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I1fce41e5ffdedc02432715cb3741ce68be857a1b
 2019-06-21 12:15:49 -07:00
Android Build Merger (Role)
bef91e9a9c Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c -s ours am: 839b1659cd -s ours am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history" into qt-r1-dev-plus-aosp 2019-06-21 19:14:36 +00:00
Selim Cinek
ac124b40cc [automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c -s ours 
am: 839b1659cd -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I34894ba27d2cff309d61baf0611b18b5d0e1d0af
 2019-06-21 12:13:47 -07:00
Selim Cinek
97c48724a3 [automerger skipped] DO NOT MERGE: Fixed an issue about notification icons on AOD am: d34e9d889a 
am: 2a3b0f1a28 -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I1f5cd435ea6097db0f57bed8aec780e195420565
 2019-06-21 12:13:26 -07:00
Android Build Merger (Role)
887144f4da Merge "Merge "Prevent loop in PermissionPolicyService" into qt-dev am: 2c824e3a7a am: ef146c3716" into qt-r1-dev-plus-aosp 2019-06-21 19:12:09 +00:00
Philip P. Moltmann
a1f939de58 Merge "Prevent loop in PermissionPolicyService" into qt-dev am: 2c824e3a7a 
am: ef146c3716

Change-Id: I858b21a365f9016cb93eb5cf83bcb062f1ef71bd
 2019-06-21 12:11:27 -07:00
Philip P. Moltmann
61bccc509c Merge "Prevent loop in PermissionPolicyService" into qt-dev am: 2c824e3a7a 
am: 3dbdc49334

Change-Id: I26c593410c01cc3e3a784abe8973af3057917fb6
 2019-06-21 12:11:25 -07:00
Selim Cinek
7cfda2b91c Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev 
am: c65d4b728c

Change-Id: I5d316626d0b2e5f397b3e5ebac951bf4320e76ca
 2019-06-21 12:05:58 -07:00
Selim Cinek
2a3b0f1a28 DO NOT MERGE: Fixed an issue about notification icons on AOD 
am: d34e9d889a

Change-Id: If02cf694d7b93b509dcb728e1496690747e1b4c9
 2019-06-21 12:05:52 -07:00
Selim Cinek
839b1659cd [automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev 
am: c65d4b728c -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: If188f2ed89de4ac8f0366b0f0b9ea979e90575ba
 2019-06-21 12:05:50 -07:00
Philip P. Moltmann
3dbdc49334 Merge "Prevent loop in PermissionPolicyService" into qt-dev 
am: 2c824e3a7a

Change-Id: Ia4f8c4c8762345bf65f890aba81d1111e654d37b
 2019-06-21 12:03:28 -07:00
Philip P. Moltmann
ef146c3716 Merge "Prevent loop in PermissionPolicyService" into qt-dev 
am: 2c824e3a7a

Change-Id: I3b705dec21aaff8024b30a3b5dcb409135eeba71
 2019-06-21 12:03:26 -07:00
TreeHugger Robot
c65d4b728c Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev 2019-06-21 18:57:25 +00:00
TreeHugger Robot
2c824e3a7a Merge "Prevent loop in PermissionPolicyService" into qt-dev 2019-06-21 18:34:53 +00:00
Antoan Angelov
bd448d80da Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b 
am: 9e3a59f51a

Change-Id: Ied3215ef90be19acf0d6c20d6e6cd1d84527577a
 2019-06-21 11:29:47 -07:00
Antoan Angelov
2c612c0a17 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b 
am: 648eb2d3a7

Change-Id: I0999d5fde028f595864633400e4368a6f5e4f430
 2019-06-21 11:27:49 -07:00
Antoan Angelov
9e3a59f51a Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 
am: ab34f61c3b

Change-Id: I49e43ed171d4ff45cf400ac9fc009ef78a2c8eef
 2019-06-21 11:22:50 -07:00