Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vichang
21ddfb5a16 Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75 am: 80a5722b9b am: ecf22c3507 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373056

Change-Id: Ie154dc167b1b858222f6eb7f9c9a6235df272f19
 2020-07-28 16:01:54 +00:00
vichang
ecf22c3507 Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75 am: 80a5722b9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373056

Change-Id: I453f4d3d600865773861dcb6e78c51185cd037f9
 2020-07-28 15:45:40 +00:00
vichang
80a5722b9b Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373056

Change-Id: I85773f31e977e6dd78bc6356fe812d0fbfd4473e
 2020-07-28 15:23:43 +00:00
vichang
f7b2126b75 Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" 2020-07-28 15:08:47 +00:00
Treehugger Robot
b507bdd498 Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8cd am: 262ad024bb am: e5f8970c5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373569

Change-Id: I6d9b4a1fcd41947cec687cafa27a833113c3ec3f
 2020-07-28 15:05:17 +00:00
Treehugger Robot
e5f8970c5d Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8cd am: 262ad024bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373569

Change-Id: Id982ac47849fc9c4865a3b93c85f12e71a5bbf3f
 2020-07-28 14:52:33 +00:00
Treehugger Robot
262ad024bb Merge "WebView: remove non-inclusive terminology from docs" am: d65785a8cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373569

Change-Id: I29ee83061203ceae125491b1a2232804dbbf534a
 2020-07-28 14:36:15 +00:00
Treehugger Robot
d65785a8cd Merge "WebView: remove non-inclusive terminology from docs" 2020-07-28 14:08:31 +00:00
Chiachang Wang
7583a24fd3 Merge "Update language to comply with Android's inclusive language guidance" am: 19c3b6dd6c am: 55c0d6e638 am: 41d7c54142 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: I2efddd398c4d7cf4d65f1c76c399a3a07a843889
 2020-07-28 11:31:06 +00:00
Chiachang Wang
41d7c54142 Merge "Update language to comply with Android's inclusive language guidance" am: 19c3b6dd6c am: 55c0d6e638 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
 2020-07-28 11:19:47 +00:00
Chiachang Wang
55c0d6e638 Merge "Update language to comply with Android's inclusive language guidance" am: 19c3b6dd6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: Ifcb4682d75b8df577281030c58b61eff53e6ae20
 2020-07-28 11:04:20 +00:00
Chiachang Wang
19c3b6dd6c Merge "Update language to comply with Android's inclusive language guidance" 2020-07-28 10:51:53 +00:00
paulhu
ab4ad20eef [RFPM03] Check permission by uid. 
PermissionMonitor check permission by each package name but only
update the uid permission to netd. It's better to check
permission by uid directly. Thus, use
ActivityManager#checkUidPermission to check permissions for each
uid.

Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I057d34383b4dc408b2773e4c6b146774ba0c5eb2
 2020-07-28 18:23:38 +08:00
Lorenzo Colitti
a40ff70cad Set the NetworkInfo subtype to 0. 
For non-telephony networks, this was always set to 0 before R.
In R, it is currently set to the same value as the network type.
This is incorrect because the two have different namespaces.
or example, currently, any network of type WIFI (==1) will have
a subtype of NETWORK_TYPE_GPRS (==1). Similarly, all ETHERNET
networks will have subtype NETWORK_TYPE_1XRTT, all VPN networks
will have a subtype of NETWORK_TYPE_TD_SCDMA, etd.

Bug: 161653721
Test: builds, boots
Change-Id: I07e111c1762e0021c931cefc27f193f78578748b
 2020-07-28 09:20:19 +00:00
Bill Yi
70441941ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie3cf0070853875a1647cd086f14d9c4f21dbf27a
 2020-07-28 01:01:30 -07:00
Chiachang Wang
9da868b59a Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m
Change-Id: I6c3c03c0c2d1302af6d5245486823c13a3432900
 2020-07-28 15:36:30 +08:00
Peiyong Lin
b967a4c381 Use more inclusive terms inside GraphicsEnvironment. 
Bug: b/162288333
Test: N/A
Change-Id: I2f1f13a892be0c8ff3f89e0ceabe39058390727d
 2020-07-27 23:57:50 -07:00
Pavan Kumar M
3708b68405 Gracefully handle integer overflows. 
Avoid recording negative data by doing integer-based
math as much as possible, but switch to double-based
math if we detect that we'd end up causing an overflow.

Test :

    - Builds, Boots
    - High data throughput scenarios
    - NetworkStatsHistoryTest, NetworkStatsCollectionTest,
      NetworkStatsTest

Bug: 119527458
Change-Id: I55d4aa649bea3ae201ad513074ff2b71cb918dad
 2020-07-28 11:36:49 +05:30
Nate Fischer
17c077cac6 WebView: remove non-inclusive terminology from docs 
No change to logic, only docs. This removes non-inclusive terminology
("whitelist") from our API javadoc, with the exception of references to
setSafeBrowsingWhitelist() (which we plan to deprecate soon, in favor of
an inclusively named API).

This rephrases one paragraph to be a bit clearer as well.

Bug: 160928306
Test: m offline-sdk-docs -j4
Change-Id: If249be8a70b01c01390ebfeb418fd7c5e119f1f2
 2020-07-27 20:27:42 -07:00
Automerger Merge Worker
cc7c1e7bb1 Merge "Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 7118a40917" into rvc-d1-dev-plus-aosp 2020-07-28 02:21:30 +00:00
Jing Ji
927d29635e Merge "Fix race condition in UidRecord cleanup" into rvc-d1-dev am: c453c4aff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12244064

Change-Id: Iee8b261b25ddd7cab96fdaf70439ac95b82a2c0b
 2020-07-28 02:21:15 +00:00
TreeHugger Robot
645544f0bf Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 7118a40917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: I5ea29b05c5c8eeb62b215bc41bc49ebd071655f0
 2020-07-28 02:21:13 +00:00
TreeHugger Robot
efe49adcec Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 8d514c97e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Ic36c15cc74651f8c5b55d1ce57f79ec3baa6126f
 2020-07-28 02:20:56 +00:00
Jing Ji
c453c4aff9 Merge "Fix race condition in UidRecord cleanup" into rvc-d1-dev 2020-07-28 02:15:06 +00:00
TreeHugger Robot
7118a40917 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Iaceb8a0974fcc4cf562a7046423019fc816ce07a
 2020-07-28 02:07:53 +00:00
TreeHugger Robot
8d514c97e4 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Icabfa347d2e16c0593182aa01c6befe73ff4d87b
 2020-07-28 02:07:37 +00:00
TreeHugger Robot
83578eaa95 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev 2020-07-28 01:47:32 +00:00
Steven Moreland
291348786a Allow module libs to use VINTF AIDL (part II) 
Allow parcelables to be compiled which report VINTF stability.

Bug: 161501127
Test: atest aidl_integration_test
Change-Id: Idc2acb28ac0475ee69385487c7ef619951f93516
Merged-In: Idc2acb28ac0475ee69385487c7ef619951f93516
 2020-07-28 01:47:10 +00:00
Steven Moreland
e5bd46e639 Allow module libs to use VINTF AIDL (part II) 
Allow parcelables to be compiled which report VINTF stability.

Bug: 161501127
Test: atest aidl_integration_test
Change-Id: Idc2acb28ac0475ee69385487c7ef619951f93516
 2020-07-28 01:21:13 +00:00
Jing Ji
630f891af5 Fix race condition in UidRecord cleanup 
It's a situation that:
1) An app process is killed;
2) A new instance of this process is created right after it
3) The bindeDied handling happens after 2)

During 2), while creating the new ProcessRecord, the old ProcessRecord
will be removed and this makes the total num of processes in this
UidRecord to be 0, then the new ProcessRecord will bump that number
by 1, in the meanwhile the new ProcessRecord will be kept in the
process name map,
During 3), while doing the cleanup for old ProcessRecord, it tries to
remove itself from the process name map, which actually has the
new ProcessRecord, so the total num of processes in the UidRecord
will become 0.

Now the fix is to make sure we are cleaning up the right ProcessRecord,
so in step 3) we will see it's already cleaned, thus we won't mess up
with the UidRecord.

Bug: 161466248
Test: see b/161466248#comment17 for detailed test steps
Change-Id: I2685e3f0162098b9b95f6b248b67aeb498e50c8e
 2020-07-28 00:32:30 +00:00
Jayant Chowdhary
d537ce04fb Update mandatory concurrent stream docs to specify support for lower resolutions. 
Bug: 162110784

Test: make doc-comment-check-docs

Change-Id: I8a2677df320f8f496b185fd80234f04dd9eed97f
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2020-07-27 17:18:12 -07:00
Adam He
edc354d399 Updated docs with clarifications on specific limitations with the new 
Inline APIs.

* limitations with multiple locales.
* limit on max number of suggestions.
* guidance on managing the order of inline suggestions when inflating.

Fixes: 161486684
Test: atest android.autofillservice.cts.inline
Change-Id: Ia560d48f95730d79bc340ff9eb0cf4a5909bf0d3
 2020-07-27 16:18:15 -07:00
Tom Cherry
e0158184d7 [automerger skipped] Merge "Delete unused imports in Statsd" am: 9e9ce9f9ef am: f2d7b77e42 -s ours am: 39e245b225 -s ours 
am skip reason: Change-Id I80203756d714bf123978d26bbe81351a1abdc967 with SHA-1 cabd127c19 is in history

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

Change-Id: I997d1676007b4376a107a3ca6c8cef6cfbb05318
 2020-07-27 22:14:42 +00:00
Tom Cherry
39e245b225 [automerger skipped] Merge "Delete unused imports in Statsd" am: 9e9ce9f9ef am: f2d7b77e42 -s ours 
am skip reason: Change-Id I80203756d714bf123978d26bbe81351a1abdc967 with SHA-1 cabd127c19 is in history

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

Change-Id: Ib8f3baa59049a5afb830e5a7ed4d438a1e5bfdf9
 2020-07-27 22:01:17 +00:00
Tom Cherry
f2d7b77e42 Merge "Delete unused imports in Statsd" am: 9e9ce9f9ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373817

Change-Id: I65d8c08fb7dc39617d5e6d8a87b941918f1fd741
 2020-07-27 21:50:00 +00:00
Tom Cherry
fd5b18820c Delete more unused includes in statsd 
Test: build
Change-Id: Ie639f57f86c2573cd5e06a1fa9397487f4b3f235
 2020-07-27 21:43:27 +00:00
Tom Cherry
9e9ce9f9ef Merge "Delete unused imports in Statsd" 2020-07-27 21:35:51 +00:00
Jiabin Huang
48019860b0 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=161896447

Change-Id: Id81a8592b54f38f4af4ce0ccfc67ce00448dc1ae
 2020-07-27 20:44:38 +00:00
Jeffrey Huang
0f719e7fc4 Delete unused imports in Statsd 
Delete libplatformprotos since its not used.

Test: m -j
Bug: 147599928
Merged-In: I80203756d714bf123978d26bbe81351a1abdc967
Change-Id: I80203756d714bf123978d26bbe81351a1abdc967
 2020-07-27 13:27:26 -07:00
Liz Kammer
1805305f94 Convert uiautomator-stubs-docs to use metalava 
Update current.txt and removed.txt to be created with metalava.

Test: m android_uiautomator
Test: m uiautomator-stubs-docs
Test: m checkapi
Bug: 144248501
Bug: 143136634
Change-Id: Ie1c52530dd03a05e244ebfd47bf9acf4448c5794
 2020-07-27 12:42:56 -07:00
Tom Cherry
6593f7c964 [automerger skipped] Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f53 am: 24b9cf1e8f -s ours am: a59f84b52d -s ours 
am skip reason: Change-Id Ia1343e4cea31feb1eba9da561d20736eb5df0a14 with SHA-1 4b4e781943 is in history

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

Change-Id: I18898a0ded804aaed27a3c51742d79c2dc7ad1df
 2020-07-27 19:09:38 +00:00
Tom Cherry
a59f84b52d [automerger skipped] Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f53 am: 24b9cf1e8f -s ours 
am skip reason: Change-Id Ia1343e4cea31feb1eba9da561d20736eb5df0a14 with SHA-1 4b4e781943 is in history

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

Change-Id: I34d89d1e0618f74da8ef248dec02a9fd5d9ffe2b
 2020-07-27 18:55:28 +00:00
Xevi Miro Bruix
5b83be6103 Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 am: 3c8639d035 am: 940fab9a0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371800

Change-Id: If61e9362fd0665bf1668c7a4e8661d28308ce116
 2020-07-27 18:38:52 +00:00
Tom Cherry
24b9cf1e8f Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371500

Change-Id: I009759300b8e5cf7943ef32732773889f04e6a72
 2020-07-27 18:34:01 +00:00
Xevi Miro Bruix
940fab9a0f Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 am: 3c8639d035 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371800

Change-Id: I5e58e4f12230f48f4c0a28fd91cafd45d72fe662
 2020-07-27 18:26:26 +00:00
Grace Jia
8587ee5cd5 Expose adhoc conference calling API as public. 
Bug: 159944852
Test: make
Change-Id: I2cf39a6fd8a02ca4f2d0c83c484ab12bb13f74c3
 2020-07-27 11:18:36 -07:00
Tom Cherry
00cf543f53 Merge "Log only a summary 'Found stale backup journal' message." 2020-07-27 18:15:33 +00:00
Xevi Miro Bruix
3c8639d035 Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371800

Change-Id: Ia443e58c97ae29fa8fb7935fae39948405288b6e
 2020-07-27 18:06:02 +00:00
Xevi Miro Bruix
c61b2279f0 Merge "Update language to comply with Android’s inclusive language guidance" 2020-07-27 17:55:36 +00:00
Tom Cherry
2ae5c5405d Log only a summary 'Found stale backup journal' message. am: 4b4e781943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12240609

Change-Id: I4bc39c3b2d5fb4487811f0d37dff832c286fce0b
 2020-07-27 17:55:31 +00:00