Commit Graph

509225 Commits

Author SHA1 Message Date
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
TreeHugger Robot
9ade8130a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 07:07:04 +00: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
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
Mohammad Islam
7fdd370876 Merge "Rewrite how we abandon sessions" am: f9e818047f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433442

Change-Id: I42a249be96a06f4c99ed38486d5cb64d501b72cd
2020-10-06 11:49:08 +00:00
Mohammad Islam
f9e818047f Merge "Rewrite how we abandon sessions" 2020-10-06 11:24:08 +00:00
Treehugger Robot
055310bc2f Merge "Add synchronized to make sure data correctness" am: e50b18b0c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433918

Change-Id: I884d8d9efee65d75ca63dd7d51c9731bfaba3af8
2020-10-06 11:05:04 +00:00
Treehugger Robot
e50b18b0c6 Merge "Add synchronized to make sure data correctness" 2020-10-06 10:47:33 +00:00
paulhu
5eba425107 Make PendingIntent immutable
PacManager puts up a notification with PendingIntent, but this
PendingIntent is mutable that content can be changed by someone.
So make the PendingIntent to be immutable to fix the content.

Bug: 169790636
Test: atest FrameworksNetTests
Change-Id: I415c8ea715b8152c975a71bdd09822211fd89b5b
2020-10-06 16:23:44 +08:00
TreeHugger Robot
16381c8fd5 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-06 05:53:10 +00:00
Yo Chiang
7af64dd1f7 Merge "Dismiss DSU notification in executeDiscardCommand()" am: 3313038017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448418

Change-Id: Id0a2b1fb7752e3d9de83f3613d0290c0ecf9096a
2020-10-06 04:38:53 +00:00
Yo Chiang
3313038017 Merge "Dismiss DSU notification in executeDiscardCommand()" 2020-10-06 04:24:41 +00:00
Bill Yi
ece0def525 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I70bf9833ecc5a676b8c70ef21ee3582cafee3d7c
2020-10-05 20:55:40 -07:00
TreeHugger Robot
2cae888d17 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-06 00:51:52 +00:00
TreeHugger Robot
d0fc9d92e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 23:28:40 +00:00
Treehugger Robot
6f8154c766 Merge "Remove vts10 related configs" am: 8dcc0164cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449315

Change-Id: Id7f8db8a860d82438e15f24f3457c4ad490a1e61
2020-10-05 21:17:04 +00:00
Treehugger Robot
8dcc0164cc Merge "Remove vts10 related configs" 2020-10-05 20:48:26 +00:00
Treehugger Robot
e17c4e0003 Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: Ieab6cfc888aa231ccfbc6c4dfb771ba1e9428ae3
2020-10-05 20:14:06 +00:00
Treehugger Robot
e7899bcd32 Merge "Bluetooth: Spell mandatory correctly" 2020-10-05 19:55:21 +00:00
Steven Moreland
c58204084b Merge "Binder interface tokens: remove extra mallocs" am: 57fd6a5f10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444677

Change-Id: I4414f9216588d7e1fb0a6e3c059bcca3a76fc552
2020-10-05 19:49:05 +00:00
Anton Hansson
103935cc2c Merge "Add last_released checking for non-updatable API" am: a474d0e92f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448956

Change-Id: I352525877588549b45ac172fb8abc793c881c72a
2020-10-05 19:16:03 +00:00
Steven Moreland
57fd6a5f10 Merge "Binder interface tokens: remove extra mallocs" 2020-10-05 18:55:58 +00:00
Steven Moreland
b219d80fb5 Binder interface tokens: remove extra mallocs
- writeInterfaceToken/enforceInterfaceToken try to get the interface
  token with GetStringRegion, so for classes with short enough
  interface descriptors, the string is allocated on the stack. A size
  of 64 was chosen since the longest interface descriptor in a
  frameworks/base AIDL file is ~40 characters.
- remove extra creation of String16 for writeInterfaceToken

Bug: 169674485
Test: atest aidl_integration_test
Change-Id: I78092abaa4df758ab699fcb103aa619b0b426e6c
2020-10-05 18:55:40 +00:00
Anton Hansson
a474d0e92f Merge "Add last_released checking for non-updatable API" 2020-10-05 18:41:06 +00:00
Myles Watson
70b5ba179c Bluetooth: Spell mandatory correctly
Bug: 169654068
Test: compilation
Change-Id: Ibb0046180760e27d6991ae17849a7405738b6f01
2020-10-05 11:23:24 -07:00
Dan Shi
9eeeaf5cc8 Remove vts10 related configs
Bug: 169581727
Test: build
Change-Id: I3ffbad3d70662aaca948943c9dfaa47b37597922
2020-10-05 11:04:45 -07:00
Bill Yi
846a8db3ef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8b9076d2169e553dcf276d1b9b134309f9c1abef
2020-10-05 08:47:34 -07:00
TreeHugger Robot
54c37b2e14 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 15:37:20 +00:00
TreeHugger Robot
f0b0827502 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 15:37:01 +00:00
TreeHugger Robot
576055cbcb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 15:34:40 +00:00
TreeHugger Robot
67df9cf5f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 15:29:47 +00:00
TreeHugger Robot
a73565777d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 15:24:04 +00:00
Anton Hansson
3258a479d3 Add last_released checking for non-updatable API
This makes the build fail when APIs are removed from the (non-updatable)
framework.jar, and e.g. into a module. This is in general not safe, so
is a reasonable default. When it needs overriding (when e.g. creating
now modules), incompatibilities.txt can be used for that.

Bug: 170105267
Test: m checkapi
Change-Id: If608be48276f0a7f76afd714656267ed379ce062
Merged-In: If608be48276f0a7f76afd714656267ed379ce062
2020-10-05 16:23:27 +01:00
Bill Yi
fcc89e3c39 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ica83dd44a785b63c7188013c235b5bebef09a170
2020-10-05 08:18:12 -07:00
TreeHugger Robot
a3d1d70981 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 14:50:09 +00:00
TreeHugger Robot
ea299cb860 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 14:18:11 +00:00
Bill Yi
b9762d2f9a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9927799662a6b134669e17d7f55001b37792e3ff
2020-10-05 06:55:32 -07:00