Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
449,106 Commits 3 Branches 0 Tags
0796fa5254d57dd88dd00a9cdebfa7a9ef68a6ea
Commit Graph

449106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
0796fa5254 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I294cc7eb605e6a000b7e6cd765c76595c1c4ff6b
 2020-07-21 21:09:53 +00:00
Treehugger Robot
3e21dc8b70 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" 2020-07-21 20:48:06 +00:00
Yifan Hong
27560823fc Merge changes Iefd5b12b,I6907880a am: b888b08ffe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365959

Change-Id: I850f44bba1efe2b2b0ed2a4eef2adeabf9b7223f
 2020-07-21 19:42:35 +00:00
Jeongik Cha
e7e3572bd6 Change LicenseHtml search path from product_services -> system_ext am: a12966975c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365958

Change-Id: I3961c5a2cd7c427f7ca58b4fc7aebeac208ae836
 2020-07-21 19:42:31 +00:00
Yifan Hong
b888b08ffe Merge changes Iefd5b12b,I6907880a 
* changes:
  Add *_dlkm notice files.
  Change LicenseHtml search path from product_services -> system_ext
 2020-07-21 19:26:43 +00:00
Yifan Hong
6c0406f7a0 Add *_dlkm notice files. 
Two new partitions are created in Android. New notice files are placed
in these new partitions.

Test: none
Bug: 156020364
Change-Id: Iefd5b12b3bbb449b189ade313157e80f36d99c88
 2020-07-21 19:26:14 +00:00
Aman Gupta
6c984953ea Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE 
From https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h,
KEY_SUBTITLE is near the TV codes. Note that 0x172 == 370.

  #define KEY_CHANNEL		0x16b
  #define KEY_FAVORITES		0x16c
  #define KEY_EPG			0x16d
  #define KEY_PVR			0x16e	/* Media Select Home */
  #define KEY_MHP			0x16f
  #define KEY_LANGUAGE		0x170
  #define KEY_TITLE		0x171
  #define KEY_SUBTITLE		0x172
  #define KEY_ANGLE		0x173
  #define KEY_FULL_SCREEN		0x174	/* AC View Toggle */
  #define KEY_ZOOM		KEY_FULL_SCREEN

You can also see on https://www.kernel.org/doc/html/v4.9/media/uapi/rc/rc-tables.html it is listed in the "Movie play control" section:

  KEY_SUBTITLE	Allow changing the subtitle

Change-Id: I7690269cddd00b787a939f87ba651db38f1160ac
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-21 12:09:52 -07:00
Max Spector
d117bf6d02 Merge "Fuzzer for libandroidfw" am: 01e469da99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365297

Change-Id: I4f08b42d1fb8d7ac05f0382a0a2b803e5bf96687
 2020-07-21 18:11:40 +00:00
Max Spector
01e469da99 Merge "Fuzzer for libandroidfw" 2020-07-21 17:44:23 +00:00
vichang
da5838aa43 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: Ie21a4ad21d4af2417f7495039582938a124403f5
 2020-07-21 16:28:34 +00:00
vichang
3bd9f08ae5 Merge "Use DateFormatSymbols directly instead of using LocaleData" 2020-07-21 16:14:26 +00:00
Treehugger Robot
c3fb05c1db Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: I13cb6bd151b1367b0e66b6a3039ed7796b4bb383
 2020-07-21 15:38:45 +00:00
Anton Hansson
4a55da60f0 Merge "Remove service stub dep on default libs" am: 58095aa504 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368337

Change-Id: If85e1c609a7629491480bea4cd36893fd70c5ae7
 2020-07-21 15:37:59 +00:00
Treehugger Robot
1710dbd097 Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" 2020-07-21 15:32:16 +00:00
Anton Hansson
58095aa504 Merge "Remove service stub dep on default libs" 2020-07-21 15:16:44 +00:00
Eduardo Rocha
935178e2fd Fuzzer for libandroidfw 
Bug: 161463861
Test: Builds and runs on host and device.

Change-Id: I78b19376275dc5a29afcab48c70eea479bff8728
 2020-07-21 13:51:37 +00:00
Anton Hansson
4304e60655 Remove service stub dep on default libs 
Not specifying any sdk_version defaults the library to building
against the platform internals. We do not want to build the stubs
against the platform internals, as that risks leaking internals
in the stubs.

Follow what the other stubs are doing, which is to build against
no default libs, and compiling with java version 1.8.

Bug: 158850553
Test: m
Change-Id: I310842747422b108ac2a1fcf11afac5c323ed5b1
 2020-07-21 14:37:25 +01:00
vichang
c52a84acf3 Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: Ibfa1c1e12f3f2c924f08ec2fa357d31cc0e8ecb7
 2020-07-21 09:22:44 +00:00
vichang
85c56c1fa4 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I487392998a37248e6079ce86cb0f82fb853cf642
 2020-07-21 09:22:15 +00:00
vichang
3db0441e5c Merge "Remove the duplicated constant declaration in DateUtilsBridge" 2020-07-21 09:11:09 +00:00
vichang
6e706c4cee Merge changes from topic "DateIntervalFormat" 
* changes:
  Make a copy of DateIntervalFormat from libcore - part 2
  Make a copy of DateIntervalFormat from libcore
 2020-07-21 08:59:57 +00:00
Victor Chang
c744bd5f64 Use DateFormatSymbols directly instead of using LocaleData 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: Id5d70328ab146d439ed45135e0fa9d1b9cc95257
 2020-07-20 21:09:40 +01:00
Victor Chang
6a691eeec7 Remove the duplicated constant declaration in DateUtilsBridge 
Bug: 160606356
Test: m droid FrameworksCoreTests
Change-Id: Ifa79b2a29c6fc0c767337efe569da2d2ba29f959
 2020-07-20 21:09:40 +01:00
Victor Chang
3a3a8ada42 Make a copy of DateIntervalFormat from libcore - part 2 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I4c4253c707211f2a5ee0a11da107ab1dd6c4fab8
 2020-07-20 21:09:40 +01:00
Michael Wright
23ff2399a1 Merge "Fix color mismatch of pointers" am: e1c169c983 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: I4a6d02a70131d3680b650db6f8feef4ef1add0ed
 2020-07-20 17:48:46 +00:00
Michael Wright
e1c169c983 Merge "Fix color mismatch of pointers" 2020-07-20 17:28:16 +00:00
Treehugger Robot
3a3a21f9dc Merge "Enable clang-format for frameworks/base" am: 8857e6b645 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1366076

Change-Id: Ie2dab15b058d18f59ddc0cb882af8808c8d42bc2
 2020-07-18 02:48:25 +00:00
Treehugger Robot
8857e6b645 Merge "Enable clang-format for frameworks/base" 2020-07-18 02:24:02 +00:00
Garfield Tan
4c2d3daf6a Enable clang-format for frameworks/base 
Copy and paste internal setup to AOSP. Not include folders not in AOSP
yet.

Bug: None
Test: repo upload
Change-Id: I08b8c6d1bae7d1954847c207ef8e6d80373b2d05
Merged-In: I08b8c6d1bae7d1954847c207ef8e6d80373b2d05
 2020-07-17 18:43:18 -07:00
Jeongik Cha
a12966975c Change LicenseHtml search path from product_services -> system_ext 
product_services partition is not used anymore, its name is changed to
system_ext, so following this, change path in LicenseHtml

Test: m
Bug: 134359158
Change-Id: I6907880ab8af456358fb3420b74dcd3e409b41f3
(cherry picked from commit 2f2fe4f72a)
Merged-In: I6907880ab8af456358fb3420b74dcd3e409b41f3
 2020-07-17 16:01:36 -07:00
Elliott Hughes
9b63f4e904 Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1215821

Change-Id: If7a6fdfcc4664cb2d1ca13e7d639fb6edbc8d5f4
 2020-07-17 18:11:53 +00:00
Elliott Hughes
285dfb3126 Merge "Zygote: Add Arm pointer authentication keychange support." 2020-07-17 18:01:19 +00:00
Anton Hansson
734c0ee397 Merge "Remove always-empty variable" am: 88a03065a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363577

Change-Id: I88359d77f76cf8b2cfa6bc88cebe5bd55732fc3a
 2020-07-17 09:19:25 +00:00
Anton Hansson
88a03065a2 Merge "Remove always-empty variable" 2020-07-17 08:51:29 +00:00
Treehugger Robot
70b6c13294 Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I45105973e1a26af563ad72c79b48937100e9f319
 2020-07-17 08:43:53 +00:00
Rubin Xu
294cbeed69 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I7a1a42f3d64dd968f6b09de3b6717c97773daa25
 2020-07-17 08:43:38 +00:00
Treehugger Robot
3846b1e2c2 Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" 2020-07-17 08:28:38 +00:00
Aaron Huang
251d68487e Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: d8b9f9fc07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757

Change-Id: Ib3e7b1ff5c2fbe3fd9a049b58faf26a6c355ad8f
 2020-07-17 05:53:43 +00:00
Aaron Huang
d8b9f9fc07 Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" 2020-07-17 05:40:31 +00:00
Aman Gupta
48a06806f1 Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST 
Change-Id: Idcf987c6e5541e29cac1b8a89263580bfcdc9636
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-16 18:27:02 -07:00
Nathan Harold
0f6ee9e766 Merge "Migrate LTE_CA flag to NRI from DSRI" am: 83cbf59a70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1357995

Change-Id: I5e7928549900090b700857e73db1c2f144504e36
 2020-07-16 17:12:02 +00:00
Nathan Harold
83cbf59a70 Merge "Migrate LTE_CA flag to NRI from DSRI" 2020-07-16 16:59:34 +00:00
Makoto Onuki
2f20e9afe7 Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: Ib2e7f6b0575ee13fc1c341f1fb566e60920a621e
 2020-07-16 16:37:48 +00:00
Makoto Onuki
def1e68ead Merge "Merge module-lib-api-stubs-docs and -non-updatable" 2020-07-16 16:12:52 +00:00
Victor Chang
8ee3807a01 Make a copy of DateIntervalFormat from libcore 
It allows the removal of @CorePlatformApi in libcore.icu

Bug: 160606356
Test: n/a
Change-Id: Id0ed2d212b6cd84ff73edc70794e002ea5f63cd0
 2020-07-16 16:23:58 +01:00
Makoto Onuki
8c61de6ddf Merge module-lib-api-stubs-docs and -non-updatable 
Test: build / treehugger
Bug: 146727827
Merged-in: I9e8038b3899270ada12ed4cc057aeace2a36902d
Change-Id: I9e8038b3899270ada12ed4cc057aeace2a36902d
 2020-07-16 15:12:05 +00:00
Treehugger Robot
a93a01f9eb Merge "Fully remove startPacSystem() and stopPacSystem()" am: c7b4009f3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229603

Change-Id: Ia0efed98d7e673259e2d16fa497ce9652be477b1
 2020-07-16 13:45:53 +00:00
Treehugger Robot
c7b4009f3e Merge "Fully remove startPacSystem() and stopPacSystem()" 2020-07-16 13:29:42 +00:00
Treehugger Robot
416911a122 Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 88f47d4d32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497

Change-Id: I74242ad8ffae7aa7bcf0562eee577d7f66747f09
 2020-07-16 11:57:03 +00:00
Treehugger Robot
88f47d4d32 Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" 2020-07-16 11:43:51 +00:00