Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
556,972 Commits 3 Branches 0 Tags
41835f9549cd47c85cd566cbc4e7da10a5bd308c
Commit Graph

556972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
41835f9549 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 am: 2ca98d2057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247

Change-Id: Ie8d6396287d02c27d8860daa0a7d455f15d9a635
 2020-09-29 17:59:16 +00:00
TreeHugger Robot
6e3a79abd9 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 am: 55582b0c4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I2d5c4d68092b840f0081de8ad189bb89d37cad00
 2020-09-29 17:59:00 +00:00
David Su
e682f08235 Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into rvc-qpr-dev am: f535f0a044 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12483645

Change-Id: I044190a45ee1971633bd6eb62e3d5a77078ceb5f
 2020-09-29 17:58:28 +00:00
Sarah Chin
2ca98d2057 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247

Change-Id: Ib69dce5f5a5e6e463544070794da7ce9b76aeea5
 2020-09-29 17:57:49 +00:00
Sarah Chin
76b7c3ccb4 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev 2020-09-29 17:41:54 +00:00
TreeHugger Robot
bf3a18c28e Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 am: dd0c3c1946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I7ba193c3f17eab8c44cb1502454fe1defe65292a
 2020-09-29 17:33:27 +00:00
TreeHugger Robot
ae2e299142 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 am: f5c645e8a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: Iad9a7e2ebc41345877c6f230c13f9ae818861826
 2020-09-29 17:32:54 +00:00
TreeHugger Robot
dd0c3c1946 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I7b1bcf3624aca31391c32167005a8d49bbf2ccb9
 2020-09-29 17:32:44 +00:00
TreeHugger Robot
55582b0c4a Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: Ibf40686e0076d97fe22a970a4695a86fb3cf150a
 2020-09-29 17:32:36 +00:00
Treehugger Robot
ab63bbb80e Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 am: 0ca8b033dd am: 4b664e7ca0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: I34dc8b244777e39fe85a0a4a5a5d2d04ec66a10b
 2020-09-29 17:32:29 +00:00
David Su
f535f0a044 Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into rvc-qpr-dev 2020-09-29 17:29:41 +00:00
TreeHugger Robot
f5c645e8a2 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I8a0f378dd8a8ff5709783edaba56a89e5253398d
 2020-09-29 17:10:38 +00:00
Treehugger Robot
4b664e7ca0 Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 am: 0ca8b033dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: Iaba4bff0265654c729bbd32d15294b65b3915d24
 2020-09-29 17:10:24 +00:00
TreeHugger Robot
bf6e731010 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I75a21c0eb76f5245776c1c3fb02711839118078e
 2020-09-29 17:09:37 +00:00
TreeHugger Robot
794e42e566 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I0ba79c5a129932dd805bb3dbda49f58702631d3d
 2020-09-29 17:09:26 +00:00
TreeHugger Robot
601e34fdd7 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev 2020-09-29 16:42:57 +00:00
Treehugger Robot
0ca8b033dd Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: Iea5ba64fd780aa1da32b129a0fd1b758631fe3a1
 2020-09-29 16:34:36 +00:00
Treehugger Robot
60d7707016 Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: I536751f25c66be56eeab2f22e941a46ea80c3b96
 2020-09-29 15:49:31 +00:00
Paul Duffin
23c51bd63b Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 am: ec334d86e0 am: c0ea6a6330 am: 0acdd44047 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: Ie227ba372d271f00cec3fe10a3658b3048658c4e
 2020-09-29 15:33:57 +00:00
Paul Duffin
860f8b380b Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc am: ad9299dcdb am: 471182f89e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Idb646f9bf7d0d2f7aff4dc52736cfcd029fab6dd
 2020-09-29 15:33:37 +00:00
Mohammad Islam
bec812403a Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c am: 4327c4ec4b am: bcd39eca7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: I993f6f29e49e28d00e7a5ccb3066347851917ea7
 2020-09-29 15:33:22 +00:00
Treehugger Robot
4d233a83b7 Merge changes I7907f0a3,Iec46c80b 
* changes:
  When the mUri is null,it will happen NullPointerException.
  Ringtone uri should add type query
 2020-09-29 15:31:16 +00:00
Paul Duffin
0acdd44047 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 am: ec334d86e0 am: c0ea6a6330 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I5762b92aef7e3e74f979801424a4bdf8d9eaf920
 2020-09-29 15:04:07 +00:00
Paul Duffin
471182f89e Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc am: ad9299dcdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Ib6e419074a06719594f48dd480a1276a9dde3dcf
 2020-09-29 15:03:53 +00:00
Mohammad Islam
bcd39eca7d Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c am: 4327c4ec4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: Ia3890f931d43a0a8fb744c2b94189a8d4bcba46b
 2020-09-29 15:03:06 +00:00
Paul Duffin
c0ea6a6330 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 am: ec334d86e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I7c4db44ba5606886c4e56ff3dfc0ab961b8fb7bf
 2020-09-29 14:43:03 +00:00
Paul Duffin
ad9299dcdb Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Icf771c1a70f86d4338e80f93c520c8d73c281fcc
 2020-09-29 14:42:44 +00:00
Mohammad Islam
4327c4ec4b Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: I5dfcf1c436b14d28db027f1300ce136fbc3f0e38
 2020-09-29 14:42:28 +00:00
Paul Duffin
ec334d86e0 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I9219118912ce6d2a752b4c22161a54f8c0c99d9c
 2020-09-29 14:22:32 +00:00
Paul Duffin
54fa7623bc Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Ie8589733d60d35b3e06b2d514cfe0dd2e3167638
 2020-09-29 14:16:47 +00:00
Mohammad Islam
6317806d3c Merge "Abandon sessions before/after running tests" am: 347e38a87b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: I00a0a3fef73a5cdad39349a5ea3cc7d836d70f8c
 2020-09-29 14:12:03 +00:00
Paul Duffin
08e7cbb0b5 Merge "Get ART public API doctag information from java_sdk_library" 2020-09-29 13:55:53 +00:00
Paul Duffin
b996945678 Merge "Use ART stubs source generated by java_sdk_library" 2020-09-29 13:55:27 +00:00
Mohammad Islam
347e38a87b Merge "Abandon sessions before/after running tests" 2020-09-29 13:43:45 +00:00
Jin Seok Park
d7d0a6d48b Merge "Add media team members to OWNERS" am: 6300a62dbb am: 1c2d6c8fd5 am: f893c9711e am: 69042dbd16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440233

Change-Id: Ib33ff071e89ba62960d1389014ee784a5be0fd35
 2020-09-29 09:13:27 +00:00
Jin Seok Park
83970e504c Merge "Add new OWNERS to media's apex folder." am: ce220d48a0 am: 0684bf6a64 am: 8986fc2257 am: d9916cd268 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440243

Change-Id: I71f75ae59d772e335909c86c7c8d570036b3bfe5
 2020-09-29 09:12:53 +00:00
Jin Seok Park
69042dbd16 Merge "Add media team members to OWNERS" am: 6300a62dbb am: 1c2d6c8fd5 am: f893c9711e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440233

Change-Id: I9425afd8386133a14b816ed73b454d715d6030c6
 2020-09-29 09:12:25 +00:00
Jin Seok Park
f893c9711e Merge "Add media team members to OWNERS" am: 6300a62dbb am: 1c2d6c8fd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440233

Change-Id: Ib6bd8494b61490ebe52603263ba873cc20455dcd
 2020-09-29 08:48:32 +00:00
Jin Seok Park
d9916cd268 Merge "Add new OWNERS to media's apex folder." am: ce220d48a0 am: 0684bf6a64 am: 8986fc2257 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440243

Change-Id: Iede6d7cd9567433d2722520f71736ef9de1f9516
 2020-09-29 08:41:43 +00:00
Jin Seok Park
1c2d6c8fd5 Merge "Add media team members to OWNERS" am: 6300a62dbb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440233

Change-Id: I413e6b1345511e91b6b4a69bfab71a3528570237
 2020-09-29 08:07:55 +00:00
Jin Seok Park
8986fc2257 Merge "Add new OWNERS to media's apex folder." am: ce220d48a0 am: 0684bf6a64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440243

Change-Id: I434cc32fe0cadbbed28786c1dbfff9785374a3d5
 2020-09-29 08:03:40 +00:00
Jin Seok Park
6300a62dbb Merge "Add media team members to OWNERS" 2020-09-29 07:47:23 +00:00
Jin Seok Park
0684bf6a64 Merge "Add new OWNERS to media's apex folder." am: ce220d48a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440243

Change-Id: I55a52d6a3ce86130567e833659712bca21ee2a76
 2020-09-29 07:39:20 +00:00
Jin Seok Park
ce220d48a0 Merge "Add new OWNERS to media's apex folder." 2020-09-29 06:55:33 +00:00
Automerger Merge Worker
841cf2f718 Merge changes from topic "am-8890be08bd9b4c77a6b9786a47fd66a9" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 4fc13f3491
  [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: 6c079ef0b5 am: f0daa2119f
 2020-09-29 06:54:51 +00:00
Charles Chen
7efa36dfa6 Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 4fc13f3491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: I6d2cf2373e3be278d87c8abab59ce26ffb92c2a8
 2020-09-29 06:54:41 +00:00
Automerger Merge Worker
09946445f1 Merge changes from topic "am-93433cfaa1dd459d86d59ba5a0437447" into rvc-d1-dev-plus-aosp am: 6a76694e27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: I9cce78c749ac2a4d6e8fd636cd8311f616a07c66
 2020-09-29 06:54:40 +00:00
Charles Chen
b7c6009b05 Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: 2804a393e2 am: 3c5a186dbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: I09e186947c0ccfd116e85819d9329434415c32b4
 2020-09-29 06:54:34 +00:00
Charles Chen
6daefe734e [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: 6c079ef0b5 am: f0daa2119f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: Ib77f65d1423db3ff9c52c15eed61995b56f75657
 2020-09-29 06:54:26 +00:00
Charles Chen
f76aeb3d9e Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 95346be8e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: Id1045490c2cb84864a111bca1d98b0c04f72e1de
 2020-09-29 06:54:09 +00:00