Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,264 Commits 3 Branches 0 Tags
6dad886eee2e496acd1ffd20301d3e089bfe6638
Commit Graph

509264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
6dad886eee Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: d00f9f0236 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335

Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
 2020-10-08 02:19:12 +00:00
Paul Hu
d00f9f0236 Merge "Remove unused ACTION_PACKAGE_ADDED intent." 2020-10-08 02:05:17 +00:00
Treehugger Robot
9626f7cc42 Merge "Clarify API docs for getCannedTextResponses." am: fc1a08a982 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451125

Change-Id: I42f39b9ed7b25263ec271ef8b0042b32524428f5
 2020-10-08 01:29:48 +00:00
Treehugger Robot
fc1a08a982 Merge "Clarify API docs for getCannedTextResponses." 2020-10-08 01:06:28 +00:00
Nate Jiang
bb446b0c37 Merge "Update javaDoc to make it consistent" am: 36d1da8f62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424828

Change-Id: I1fff96f9214e8313b6719aeceb9ba436b69a010b
 2020-10-07 22:38:51 +00:00
Nate Jiang
36d1da8f62 Merge "Update javaDoc to make it consistent" 2020-10-07 22:16:58 +00:00
Treehugger Robot
7c0c7500af Merge "Stop keeping freeform activities visible." am: 82cb76f908 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453235

Change-Id: I5af42a21fb438f828980ffc05dc3a9be32e6314d
 2020-10-07 19:59:44 +00:00
Treehugger Robot
82cb76f908 Merge "Stop keeping freeform activities visible." 2020-10-07 19:40:05 +00:00
Brad Ebinger
58e629fd68 Merge changes from topic "redo_ims_poll" am: ec6681c927 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I0972e8db35cc51932578fa8e9e785466352d203a
 2020-10-07 18:49:39 +00:00
Brad Ebinger
4c8316091f Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ia942c0ba88d6ba081569540b617d9b79fb758659
 2020-10-07 18:41:47 +00:00
Brad Ebinger
ec6681c927 Merge changes from topic "redo_ims_poll" 
* changes:
  Remove "one shot" type of FeatureCallback
  Clean up IMS based interfaces to use a push model instead of poll
 2020-10-07 17:49:29 +00:00
Garfield Tan
1bb6900a61 Stop keeping freeform activities visible. 
This logic was introduced when there could be multiple tasks in the
freeform stack so it was necessary to keep freeform tasks visible even
when they are not in the front. However right now stack and task are the
same so activities became the children of the original stack, and we
don't have the need to keep activities behind the top activity always
visible.

Bug: 161366153
Bug: 166012554
Bug: 167751180
Test: atest ActivityVisibilityTests#testConvert* on freeform first
      devices.
Change-Id: Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037
Merged-In: Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037
 2020-10-07 10:43:04 -07:00
TreeHugger Robot
2943d70788 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:57:40 +00:00
TreeHugger Robot
b3cbc66070 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:54:38 +00:00
TreeHugger Robot
cfe0491c27 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:41:19 +00:00
TreeHugger Robot
aabad94a4d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:26:24 +00:00
TreeHugger Robot
0609e2b01d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:20:52 +00:00
Bill Yi
5581023158 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e349a495a3642ec1d3830bff526ed25001f9f75
 2020-10-07 04:54:22 -07:00
Anton Hansson
dd7eb2b019 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: If74e60e3b97c22bdeb32e59b56c9476e6adf64fb
 2020-10-07 10:00:18 +00:00
Mark Chien
fabe5787f0 Merge "Make the IP subnet persistent till reboot" am: 818da784dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I0aaa978e8edd7e8666413fb18352fa83e9fb5469
 2020-10-07 09:55:29 +00:00
Anton Hansson
b0ba7618c8 Merge "Add genrule for combined-removed-dex" 2020-10-07 09:54:43 +00:00
Mark Chien
818da784dd Merge "Make the IP subnet persistent till reboot" 2020-10-07 09:39:29 +00:00
Bill Yi
45889f6edb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14c04e0e9b99c8227a12a9e49cf0c8e28f92c0f7
 2020-10-07 02:38:30 -07:00
Chiachang Wang
a7136c6340 Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
 2020-10-07 09:22:49 +00:00
Chiachang Wang
7039b0ca8a Merge "Prevent going through unnecessary networks" am: 836af202e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: I7e7603f416202a387804a7060e6b1d62ce81c6bd
 2020-10-07 09:19:35 +00:00
Chiachang Wang
1c7bc039ea Merge "Update to positive logic to better match the method naming" 2020-10-07 08:21:32 +00:00
Chiachang Wang
836af202e0 Merge "Prevent going through unnecessary networks" 2020-10-07 08:21:04 +00:00
Bill Yi
0e9f763902 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6f49cca9040a04e24c3477ee6779e78d4e09dae
 2020-10-07 01:07:58 -07:00
Hai Zhang
be5c84157b Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996

Change-Id: I03d973e7b7aad386a55e9bff35577711293411ad
 2020-10-07 08:00:38 +00:00
Paul Hu
09448f961c Merge "Make PendingIntent immutable" am: bbab1d3b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450495

Change-Id: Id8b270aaf94b322aca0338a25d2bada9d2699169
 2020-10-07 07:46:21 +00:00
Bill Yi
a225200fc2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5990ede7dab666583341bc53e143a5037301dbc6
 2020-10-07 00:22:18 -07:00
TreeHugger Robot
9ade8130a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 07:07:04 +00:00
Chiachang Wang
8c1372ed1d Update to positive logic to better match the method naming 
The method checkInterfacePresent seems that should return if the
interface is present or not, but it actually return an opposite
result. It may confuse the caller. E.g. The override method in
VpnTest assume it always returns true in the test. It will fail
the vpn start flow due to interface gone.

Bug: 169215213
Test: atest FrameworksNetTess
Change-Id: I3e9a64f0900336b8205674b94db68f090b4e9ff9
 2020-10-07 06:48:15 +00:00
Bill Yi
77dad9481e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If70f12909df07fd6fd1eb9f9bd5686599385e171
 2020-10-06 23:36:32 -07:00
Hai Zhang
1839f9f7f8 Merge "Add myself to system server permission code OWNERS." 2020-10-07 05:31:10 +00:00
Paul Hu
bbab1d3b4f Merge "Make PendingIntent immutable" 2020-10-07 03:53:30 +00:00
Hai Zhang
4e17c9292a Add myself to system server permission code OWNERS. 
Test: presubmit
Change-Id: I19a532d54f8126adfae2b3ab50e5b138a90f8c8b
 2020-10-07 00:03:33 +00:00
Tyler Gunn
434fc2c524 Clarify API docs for getCannedTextResponses. 
The API docs do not clearly indicate the fact that canned text responses
may not be available when a call is first added.  Updating the API docs
to clarify this and reference the listener a developer can use to be
informed of changes to the canned responses.

Test: Docs only change.
Bug: 162843384
Change-Id: I52ced96439b2dfa31c1f2428979ab54466763afa
 2020-10-06 14:23:54 -07:00
Xin Li
60207dea5d [automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours 
am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 0a012afd4a is in history

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

Change-Id: I440e9559f0ac14f48c6d672bdf44992f8db8d82f
 2020-10-06 20:23:54 +00:00
Xin Li
85e07ab8bb Merge "DO NOT MERGE - Merge RP1A.201005.006" 2020-10-06 20:17:27 +00:00
Treehugger Robot
bb2a513010 Merge "Expose getSmsCapacityOnIcc()" am: 4d96662b1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1293900

Change-Id: I0085abc3b4513bb0a8f6b5ab6bace92a8f578458
 2020-10-06 20:17:06 +00:00
Treehugger Robot
4d96662b1f Merge "Expose getSmsCapacityOnIcc()" 2020-10-06 20:12:05 +00:00
Steven Moreland
bedff86e1a Merge "HIDL: unsilence error for local Java binder" am: d806764162 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445875

Change-Id: I748df2b8c1784dd22b6d5a7655d35562e9ca7ca8
 2020-10-06 20:10:38 +00:00
Steven Moreland
d806764162 Merge "HIDL: unsilence error for local Java binder" 2020-10-06 19:38:50 +00:00
Taesu Lee
a248f3586f Expose getSmsCapacityOnIcc() 
Unhide getSmsCapacityOnIcc() and it requires READ_PHONE_STATE instead.

Bug: 154878196
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Merged-in: I86ba39d5073227ff55251fabc614fd3b9347285e
Change-Id: I86ba39d5073227ff55251fabc614fd3b9347285e
 2020-10-06 18:13:58 +00:00
The Android Open Source Project
e325f5b1ae DO NOT MERGE - Merge RP1A.201005.006 
Bug: 168212094
Merged-In: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
Change-Id: Id9e5f7c81b0629d5b4dde43271d0120be43f16be
 2020-10-06 16:49:03 +00:00
Tyler Gunn
0c1a841122 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I6277cd5b2fc432dcf8aeefe0088c5ba25095f300
 2020-10-06 16:35:38 +00:00
Tyler Gunn
2046a9dced Merge "Make android.telecom.action.POST_CALL a protected broadcast." 2020-10-06 16:12:23 +00:00
Bill Yi
2ea96c2ee0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id3ca93d9c0ca0ff6b79acfd36d763b3176d9ba1f
 2020-10-06 06:06:01 -07:00
Anton Hansson
a15427af11 Add genrule for combined-removed-dex 
This is a module that aims to have the same contents as
out/soong/hiddenapi/combined-dex-api generated by hiddenapi_singleton.go
inside soong, but generated using a different method that does not
depend on the monolithic droidstubs rule in frameworks/base.

This is part of a series of changes to remove all the dependencies on
the monolithic droidstub rules, so that they can eventually be removed.

Bug: 169034951
Bug: 169395887
Test: m combined-dex-api
Change-Id: I2c4a76aa1d85ef44fc467474afacec20901aee13
 2020-10-06 12:58:51 +00:00