Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
633,293 Commits 3 Branches 0 Tags
a6855438f8e476ac84b95434d0fab118db669c75
Commit Graph

633293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a6855438f8 [automerger skipped] Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a am: 131557b166 -s ours 
am skip reason: skip tag Change-Id I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1 with SHA-1 a1245b1c7c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I32efb73124006edc49206b039d74f91068c33ea7
 2021-03-31 23:29:44 +00:00
Alan Viverette
5c15f94f79 Merge "FIx issue: https://issuetracker.google.com/issues/183024999" am: 2e1c97a4e8 am: 095c053c3f am: 9ee35481d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645426

Change-Id: Idba06d2713407fff424eecf503066f902bee0924
 2021-03-31 23:28:57 +00:00
Suprabh Shukla
bffedcfa00 [automerger skipped] Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 am: c9b05d56ec -s ours 
am skip reason: skip tag Change-Id I60e745c4ff32cbf8f8ff8b5d016555a25a065f39 with SHA-1 00967754c3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: Ic088e14fe00de9e68b703640aded8985e8b19bb1
 2021-03-31 23:28:35 +00:00
Benedict Wong
055acf8c2e Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe am: f20f1b0897 am: 24d8a37c70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: Iba715b8e73710cab26f68396226b354c9ccfe9e4
 2021-03-31 23:27:50 +00:00
TreeHugger Robot
af4aea5f95 Merge "Update some Package Installer strings." into sc-dev 2021-03-31 23:10:32 +00:00
Seigo Nonaka
8192e2690a Merge "Override isRestricted for preventing unexpected resource loading" into rvc-qpr-dev am: 39c49f8daa am: 0b8ee8ecc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855846

Change-Id: I249facabda3a5c38cc9ae0ee1cb54a5fe00a5108
 2021-03-31 23:07:49 +00:00
TreeHugger Robot
279253f0fc Merge "Stretch breaks on wembley" into sc-dev 2021-03-31 22:50:03 +00:00
Josh Tsuji
396acbc6a7 Merge "Fade in notifications on wakeup." into sc-dev 2021-03-31 22:48:07 +00:00
Zhen Zhang
bf5667bec6 Merge "Persist user-agnostic lastTimeAnyComponentUsed in disk" into sc-dev 2021-03-31 22:43:53 +00:00
Treehugger Robot
131557b166 Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I91da6f7fb815ac46479dd6d5b02451959cdf5f19
 2021-03-31 22:43:42 +00:00
Alan Viverette
9ee35481d1 Merge "FIx issue: https://issuetracker.google.com/issues/183024999" am: 2e1c97a4e8 am: 095c053c3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645426

Change-Id: I624bd5a9fcecf731c34d80930a4593e10e390f5a
 2021-03-31 22:43:01 +00:00
Suprabh Shukla
c9b05d56ec Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: I716890b1950fd131357522c24cabec5db9b5127e
 2021-03-31 22:42:44 +00:00
Benedict Wong
24d8a37c70 Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe am: f20f1b0897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: I5b52782e9e741421e57189e58faa75005baa7ff7
 2021-03-31 22:41:53 +00:00
Seigo Nonaka
0b8ee8ecc3 Merge "Override isRestricted for preventing unexpected resource loading" into rvc-qpr-dev am: 39c49f8daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855846

Change-Id: If44737735289f45e9cc30fc3c9498e591b479fa3
 2021-03-31 22:40:50 +00:00
Jorge Gil
5d2a09adf0 Merge "Account for OHM offset before possibly hiding the PIP menu" into sc-dev 2021-03-31 22:18:53 +00:00
Treehugger Robot
5efafd667a Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I957eacc704b8c02e043af875de8232a72287aefd
 2021-03-31 22:16:54 +00:00
Alan Viverette
095c053c3f Merge "FIx issue: https://issuetracker.google.com/issues/183024999" am: 2e1c97a4e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645426

Change-Id: I58ed1f46546ea34e74ff4563e3bc83b20a369d44
 2021-03-31 22:11:11 +00:00
Suprabh Shukla
0272cc7dd7 Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659548

Change-Id: I6c471d144a22180c5d4d8c5ded1bed0b97455f32
 2021-03-31 21:55:56 +00:00
TreeHugger Robot
27ec0f6a4a Merge "[incremental] fix metrics logging during ANR" into sc-dev 2021-03-31 21:54:15 +00:00
Seigo Nonaka
39c49f8daa Merge "Override isRestricted for preventing unexpected resource loading" into rvc-qpr-dev 2021-03-31 21:53:43 +00:00
Treehugger Robot
8b0cfd1550 Merge "Revert "Rename the font file with PostScript name based file name"" 2021-03-31 21:49:21 +00:00
Benedict Wong
f20f1b0897 Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915

Change-Id: I7c0c4887c813c8b0a61b498c07d3444d2f9689d9
 2021-03-31 21:36:55 +00:00
Nader Jawad
7148aa7270 Stretch breaks on wembley 
Work around GPU driver issues on Wembley.
Refactor the overscroll stretch shader to
explicitly return values in the helper methodsd
instead of using out parameters to store the
result.

Fixes: 182566543
Test: manual
Change-Id: Ib9c57d7cb3de06bc7155fa2af364d70cbf2ea812
 2021-03-31 14:27:12 -07:00
Alan Viverette
2e1c97a4e8 Merge "FIx issue: https://issuetracker.google.com/issues/183024999" 2021-03-31 21:09:53 +00:00
Suprabh Shukla
502baa4117 Merge "Adding some permissions to Shell to enable testing" 2021-03-31 21:08:54 +00:00
Suprabh Shukla
7ff8faf4af Merge "Adding a permission to Shell to enable testing" into sc-dev 2021-03-31 21:08:07 +00:00
Josh Tsuji
67306a3111 Fade in notifications on wakeup. 
We will be adding better expansion/translation animations here, but this is better than the current state of things, where notifs just suddenly appear.

Bug: 181020504
Test: manual
Change-Id: Ic350c6b59077d717b23d21ed5dff9f6f7301a658
 2021-03-31 17:06:46 -04:00
Nikita Dubrovsky
2bb75a4007 Merge "Rename getOnReceiveContentMimeTypes (drop "On")" into sc-dev 2021-03-31 21:06:21 +00:00
Marvin Bernal
68871a3d6b Merge "Add System Back function to SystemUiProxy" into sc-dev 2021-03-31 20:59:01 +00:00
Benedict Wong
ab765e0ebe Merge changes I2d30b75c,I57ecf4f5 
* changes:
  Switch to using list of subIds for policy generation
  Switch to using list-of-subIds for VCN selection of underlying networks
 2021-03-31 20:59:00 +00:00
Edward Cunningham
361808fb36 Update some Package Installer strings. 
Bug: 183699047
Test: manual
Change-Id: I632bcaf2b448d3c697be0fe060df7cc5b67da94e
 2021-03-31 20:57:54 +00:00
Seigo Nonaka
e95ec27dd6 Revert "Rename the font file with PostScript name based file name" 
Revert "Update ImageGenerator to match the latest font names."

Revert "Rename font file with PostScript based names"

Revert submission 1606485-rename_fonts

Reason for revert: font file name requirement was removed.

Reverted Changes:
Iab8b9d65a:Update ImageGenerator to match the latest font nam...
Ifbe99d68c:Rename the font file with PostScript name based fi...
I307c21531:Rename font file with PostScript based names

Change-Id: I95a52403590127f1762c7551edff9805096daf79
Merged-In: I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1
 2021-03-31 20:38:40 +00:00
Yi Jiang
48c52c219e Merge "Fixes javadoc in RotationResolutionRequest" into sc-dev 2021-03-31 20:31:05 +00:00
TreeHugger Robot
be36d94e85 Merge "Adjust callbacks on handler thread." into sc-dev 2021-03-31 20:17:24 +00:00
Roman Kiryanov
1536af9cb8 Merge "Migrate HostClipboardMonitor to virtio-vsock" am: 7265a87552 am: 31e043b357 am: 389e9a153d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640632

Change-Id: If5be52220e8264985ba26794fb3a54ae2d438ac2
 2021-03-31 20:16:12 +00:00
Treehugger Robot
8bac726d7e Merge "Add measurement for dex size." am: bdcda2cb05 am: a3e895e610 am: ce4d517cdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648807

Change-Id: Ic72516432967170799097df3ccb1875c5ce40df7
 2021-03-31 20:15:50 +00:00
John Reck
0541da6a5c Merge "Add more OWNERs for graphics team" am: cabdc4cd72 am: 7825cff234 am: ecd1e92f7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660478

Change-Id: Ie52be489632d54a56f0243af1ea041c09aea4012
 2021-03-31 20:15:02 +00:00
TreeHugger Robot
0b6458094d Merge "Revert font file rename." into sc-dev 2021-03-31 20:10:03 +00:00
Forrest Dunlap
527b38c7a2 Merge "Clarify resetToDefaults documentation." into sc-dev 2021-03-31 20:04:43 +00:00
Jeffrey Huang
090ceb3af9 Merge "Close the FD after opening the file" into sc-dev 2021-03-31 19:57:57 +00:00
Miranda Kephart
5c4553b29f Merge "Don't send long-press event if KEYCODE_UNKNOWN" into sc-dev 2021-03-31 19:51:17 +00:00
Roman Kiryanov
389e9a153d Merge "Migrate HostClipboardMonitor to virtio-vsock" am: 7265a87552 am: 31e043b357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640632

Change-Id: Ia247ad02cd0448c68a163d9ef5e23d9e3cfc87bd
 2021-03-31 19:50:53 +00:00
Lajos Molnar
87c3471588 Merge "media: add MediaFormat.KEY_AUDIO_HW_SYNC hidden key" into sc-dev 2021-03-31 19:40:30 +00:00
Jeff Sharkey
3076233c8a Merge "Continue populating legacy data structures." into sc-dev 2021-03-31 19:35:27 +00:00
TreeHugger Robot
c532595c3e Merge "Update boot image and system server profiles [M5C5P90S0PP]" into sc-dev 2021-03-31 19:31:32 +00:00
Treehugger Robot
ce4d517cdf Merge "Add measurement for dex size." am: bdcda2cb05 am: a3e895e610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648807

Change-Id: I914acb7986ce684ee722e43470508866c365236b
 2021-03-31 19:31:10 +00:00
John Reck
ecd1e92f7f Merge "Add more OWNERs for graphics team" am: cabdc4cd72 am: 7825cff234 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660478

Change-Id: Ibe0ff8889f125cc4006824ea6db9387ca854aa2d
 2021-03-31 19:30:51 +00:00
Roman Kiryanov
31e043b357 Merge "Migrate HostClipboardMonitor to virtio-vsock" am: 7265a87552 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640632

Change-Id: Ia16312f7b9c9b0fa34cdd7e055e88e5ff692656d
 2021-03-31 19:30:07 +00:00
Ryan Mitchell
b1e62648bf Merge "Remove ApkAssets access in finalizer" into sc-dev 2021-03-31 19:21:57 +00:00
Treehugger Robot
a3e895e610 Merge "Add measurement for dex size." am: bdcda2cb05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648807

Change-Id: Ibeef0e1d96d2fd8cc7e4f02a5aa9aaf12378de0d
 2021-03-31 19:11:10 +00:00