OSDN Git Service
Lorenzo Colitti [Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)]
Merge changes Icd56662d,I0ece820f am:
47ef64b0d2
am:
bf66580c0b
Change-Id: I5faf7049c376eb400a41231448d9414471ae6777
Lorenzo Colitti [Thu, 15 Feb 2018 11:43:29 +0000 (11:43 +0000)]
Merge changes Icd56662d,I0ece820f
am:
47ef64b0d2
Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c
Lorenzo Colitti [Thu, 15 Feb 2018 10:03:26 +0000 (10:03 +0000)]
Merge changes Icd56662d,I0ece820f
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
Lorenzo Colitti [Thu, 15 Feb 2018 07:43:44 +0000 (16:43 +0900)]
Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
Lorenzo Colitti [Thu, 15 Feb 2018 06:51:58 +0000 (15:51 +0900)]
Add OWNERS to the libandroid_net library.
Test: None
Change-Id: I0ece820fc0de786a81df9f922135acdf92f1d136
Jakub Pawlowski [Thu, 15 Feb 2018 05:49:13 +0000 (05:49 +0000)]
Merge "Hearing Aid profile" am:
aca4460b64
am:
edb16b0f4b
Change-Id: Ica92a9ffecb205f07288139970cd83f578ef7669
Jakub Pawlowski [Thu, 15 Feb 2018 05:37:45 +0000 (05:37 +0000)]
Merge "Hearing Aid profile"
am:
aca4460b64
Change-Id: I2f0367b57ec720c3b46b0f2984b77068db3fa3c1
Treehugger Robot [Thu, 15 Feb 2018 04:14:43 +0000 (04:14 +0000)]
Merge "Hearing Aid profile"
Siyamed Sinir [Thu, 15 Feb 2018 00:56:53 +0000 (00:56 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340 am:
bb0a801a85
am:
dc288fc3ec
Change-Id: I55d644d7028d7a69d8aec16c379d052608d7f336
Siyamed Sinir [Thu, 15 Feb 2018 00:43:01 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340
am:
bb0a801a85
Change-Id: I872e5511439ee880f7837a06d5449f556ffb1ebc
Siyamed Sinir [Thu, 15 Feb 2018 00:31:11 +0000 (00:31 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
am:
1fd506a340
Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
Jakub Pawlowski [Wed, 22 Nov 2017 19:02:34 +0000 (11:02 -0800)]
Hearing Aid profile
This is implementation of Hearing Aid Profile that will in future
be connected to Bluetooth Manager - see TODOs in BluetoothHearingAid.java
Bug:
69623109
Test: compilation. Manual test with HA.
Change-Id: I79643ea1e14e9df7f5771169359c964a60c56618
Benedict Wong [Wed, 14 Feb 2018 21:25:08 +0000 (21:25 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created" am:
2c8456b22e
am:
3988c929ad
Change-Id: I041cd94be9cefc997b95478444661b557d95e3dc
Benedict Wong [Wed, 14 Feb 2018 21:14:19 +0000 (21:14 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
am:
2c8456b22e
Change-Id: I24ac6baa0492a46bf5810bc6bc146d9aaa9eccab
Chen Xu [Wed, 14 Feb 2018 21:09:29 +0000 (21:09 +0000)]
Merge "add a current table in CarrierIdProvider" am:
3fa6fe2117
am:
9fce67f50f
Change-Id: Ia8dbd47c1c4cf775f7597e7e93c8315bf004e9e0
Chen Xu [Wed, 14 Feb 2018 21:00:42 +0000 (21:00 +0000)]
Merge "add a current table in CarrierIdProvider"
am:
3fa6fe2117
Change-Id: I5e734d3b55332e5d9bb5bc27515625456edb5df5
Benedict Wong [Wed, 14 Feb 2018 19:37:53 +0000 (19:37 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
Chen Xu [Wed, 14 Feb 2018 18:54:06 +0000 (18:54 +0000)]
Merge "add a current table in CarrierIdProvider"
Jiyong Park [Wed, 14 Feb 2018 16:17:16 +0000 (16:17 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps" am:
779f561650
am:
78c71ca44b
Change-Id: I4e97594663b711f18a3940e002fceac215575d1c
Jiyong Park [Wed, 14 Feb 2018 16:08:59 +0000 (16:08 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps"
am:
779f561650
Change-Id: Iccbb6f4f98aece6ee8d5f41c95e5f0eb56bff94e
Treehugger Robot [Wed, 14 Feb 2018 15:02:22 +0000 (15:02 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps"
Nicolas Geoffray [Wed, 14 Feb 2018 14:07:55 +0000 (14:07 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive" am:
46b4862d20
am:
d0f327cc60
Change-Id: Iaa313ddff5b22ed22baa916d931befc7a59090ba
Nicolas Geoffray [Wed, 14 Feb 2018 13:57:37 +0000 (13:57 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive"
am:
46b4862d20
Change-Id: Ib750c357265a13f60032104371d84974df17776e
Nicolas Geoffray [Wed, 14 Feb 2018 11:41:02 +0000 (11:41 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive"
Martijn Coenen [Wed, 14 Feb 2018 11:15:37 +0000 (11:15 +0000)]
Merge "add swapPss of native process to totalSwapPss" am:
0db84fcc8f
am:
c3af6331e5
Change-Id: I4e8dbdd04ae92d1b6882ac476e8b4990a34bbb27
Martijn Coenen [Wed, 14 Feb 2018 11:08:54 +0000 (11:08 +0000)]
Merge "add swapPss of native process to totalSwapPss"
am:
0db84fcc8f
Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb
David Brazdil [Tue, 13 Feb 2018 17:04:26 +0000 (17:04 +0000)]
Refactor runtime hidden API flag from negative to positive
There are only two situations in which we want to enable hidden API
access flag checks. Turning the flag from DISABLE_ to ENABLE_
simplifies logic in ART and reduces the number places where the flag
had to be passed down to ART.
Bug:
64382372
Test: boot device, install and run apps, check log messages
(cherry picked from commit
f7e31c0a2b69e97662e2bdeb7e5b5c6d0a7f995c)
Change-Id: Ib2f70696d98c6e1500d1d419d6acf0a8d0487213
Martijn Coenen [Wed, 14 Feb 2018 09:17:32 +0000 (09:17 +0000)]
Merge "add swapPss of native process to totalSwapPss"
fionaxu [Mon, 29 Jan 2018 22:08:12 +0000 (14:08 -0800)]
add a current table in CarrierIdProvider
restructure CarrierIdProvider into two tables
1. All - a private table which stores a complete mapping of all carriers
2. Current - a public table only stores the carrier identification of the
current active subs. require no permission to query.
expose the content url to public so that apps could be
notified on carrier identity change either on background or foreground.
Bug:
72571475
Test: runtest --path CarrierIdProviderTest.java
Test: Manual
Change-Id: If2a20288e63d25343f5bb582b35564d769a4e13b
(cherry picked from commit
3d00d698d7d6c10628076cca8df30adb50c52563)
Merged-in: If2a20288e63d25343f5bb582b35564d769a4e13b
Jiyong Park [Wed, 14 Feb 2018 07:26:04 +0000 (16:26 +0900)]
Fix link-type check warning on PMTest_Java* test apps
The test apps are built with SDK, but are using native libraries built
without SDK (libpmtest(32|64|dual)). This has been causing link-type check
warning, which will be errors soon.
Fixing the warning by building the native libraries with SDK.
Bug:
69899800
Test: mma -j under
frameworks/base/core/tests/hosttests/test-apps/SharedUid is successful
and does not show any link-type check warning
Change-Id: I660edb9accd8965ddd471f88f2b47f6b7285b83f
Robert Sesek [Wed, 14 Feb 2018 05:43:52 +0000 (05:43 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress." am:
9fda81e274
am:
9b13db0938
Change-Id: Ic977e64157b6c140f4ac6c22643ca1b9375f855c
Robert Sesek [Wed, 14 Feb 2018 05:36:58 +0000 (05:36 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress."
am:
9fda81e274
Change-Id: If044eb9eb5b27e7fa21d750dd09a8e56c07b8e50
Treehugger Robot [Wed, 14 Feb 2018 03:35:37 +0000 (03:35 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress."
Tyler Gunn [Wed, 14 Feb 2018 01:09:08 +0000 (01:09 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity." am:
d1134525fc
am:
a0b41a82ce
Change-Id: I6b5e25889bf0b5ceab71fe21d1856214d12a593d
Tyler Gunn [Wed, 14 Feb 2018 00:59:16 +0000 (00:59 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity."
am:
d1134525fc
Change-Id: Ic2a84646352e79961d2e5d842b307a0d647350bb
Holly Jiuyu Sun [Wed, 14 Feb 2018 00:24:46 +0000 (00:24 +0000)]
Merge "Public EuiccManager APIs." am:
42339c464f
am:
cddc0c12cc
Change-Id: I01d436c16df678292c8aec1f3ea2d7a65f3e10dd
Malcolm Chen [Wed, 14 Feb 2018 00:12:29 +0000 (00:12 +0000)]
Merge "Add death recipient to TelephonyRegistry." am:
e42d29f31b
am:
244804f1b2
Change-Id: I2494c9affb98b646c74bf4983eebaa1becc62ff7
Holly Jiuyu Sun [Wed, 14 Feb 2018 00:08:35 +0000 (00:08 +0000)]
Merge "Public EuiccManager APIs."
am:
42339c464f
Change-Id: I95f1713b1a1be188e7eae62adbfc975bfca982c3
Malcolm Chen [Wed, 14 Feb 2018 00:04:57 +0000 (00:04 +0000)]
Merge "Add death recipient to TelephonyRegistry."
am:
e42d29f31b
Change-Id: I20eb0b07a89b6dde2187339e28c0c3b50323370d
Treehugger Robot [Tue, 13 Feb 2018 23:27:33 +0000 (23:27 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity."
Benedict Wong [Wed, 7 Feb 2018 04:43:21 +0000 (20:43 -0800)]
Copy IpSecConfig when IpSecTransforms are created
This change prevents IpSecTransforms from being inadvertently modified
by changes to the IpSecConfig. Specifically, once the transform is
created, it takes a copy of the config, rather than a reference.
Bug:
69385347
Test: New tests added, and all test passing
Change-Id: I89b8660c175ca20aa70352dcda893434ff7fd42b
Holly Jiuyu Sun [Tue, 13 Feb 2018 22:56:08 +0000 (22:56 +0000)]
Merge "Public EuiccManager APIs."
Qingxi Li [Tue, 13 Feb 2018 22:19:02 +0000 (22:19 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo" am:
909e9d3e49
am:
feba71b4ef
Change-Id: I4c65138fd4283c2023737c294f92d82346943157
Qingxi Li [Tue, 13 Feb 2018 22:06:45 +0000 (22:06 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo"
am:
909e9d3e49
Change-Id: I610ad9785c419c864a604c2a330e07e56b6a19f2
Treehugger Robot [Tue, 13 Feb 2018 21:27:39 +0000 (21:27 +0000)]
Merge "Add death recipient to TelephonyRegistry."
Holly Jiuyu Sun [Wed, 13 Dec 2017 04:17:09 +0000 (20:17 -0800)]
Public EuiccManager APIs.
Public EuiccManager and other related necessary files.
Mark EuiccCardManager and other related necessary files as @SystemApi.
Solve lint errors and warnings.
Bug:
35851809
Test: test on phone
Change-Id: I8a2c78804cae56b679d311d613edca5be4bc2522
Merged-In: I68853e134e1e31fa9b91a83af6c491a2a8cca971
Treehugger Robot [Tue, 13 Feb 2018 19:32:01 +0000 (19:32 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo"
Qingxi Li [Wed, 31 Jan 2018 21:54:34 +0000 (13:54 -0800)]
Add interfact to get phone ID from UiccSlotInfo
Bug:
72753162
Test: TreeHugger
Merged-In: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Change-Id: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Robert Sesek [Fri, 26 Jan 2018 19:26:53 +0000 (14:26 -0500)]
Refactor ZygoteProcess to deal in LocalSocketAddress.
Currently ZygoteProcess only uses String names in the RESERVED socket
namespace. This CL reworks the class to use LocalSocketAddress, so that
other socket namespaces can be used to communicate with zygotes.
Bug:
63749735
Test: m (no functional change)
Merged-In: I4146f684bfcd78b16500829d02ff54590a8b48f5
Change-Id: I0113a7189530c2e57c48058df542057e855bae42
Malcolm Chen [Tue, 13 Feb 2018 03:15:59 +0000 (19:15 -0800)]
Add death recipient to TelephonyRegistry.
Add death recipient to TelephonyRegistry so that all binders that
connect to TelephonyRegistry will be cleaned when they are died.
Test: manual
Bug:
73107019
Change-Id: Ib44f72b769272cef9f36f7b49097091a93bcc70e
hansson [Tue, 13 Feb 2018 16:39:33 +0000 (16:39 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log" am:
c0c9f53175
am:
78d15fd15a
Change-Id: Ie90bccf5aa5fb67e1b4769fcbb1013b1fae71063
hansson [Tue, 13 Feb 2018 16:31:53 +0000 (16:31 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"
am:
c0c9f53175
Change-Id: I25f1aad9e04c22e0cd4ffc848a53c30dd740bdac
hansson [Tue, 13 Feb 2018 14:42:03 +0000 (14:42 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"
yuanhuihui [Sat, 18 Mar 2017 11:34:31 +0000 (19:34 +0800)]
fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log
There will be the following situations about mApplicationObject:
1) fork app process will invoke ActivityThread.main(),
then set mApplicationObject.
2) fork system_server, don't set mApplicationObject value.
3) using app_process fork process except zygote, will inovke RuntimeInit,
don't set mApplicationObject value。
For example using command as below:
app_process /system/bin com.android.commands.am.Am "$@",
if this process throw uncaught exception,will output FATAL EXCEPTION IN SYSTEM PROCESS log,
it's not in system process but in normal process。
so should add condition: Process.SYSTEM_UID == Process.myUid()
BUG:
72759350
Test: manual
Change-Id: Ie8d769e4149cd9b938577058de871c4f8db9efe5
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
Tyler Gunn [Tue, 13 Feb 2018 10:01:58 +0000 (10:01 +0000)]
Merge "Updates to Telecom API docs for clarity." am:
e845bddb40
am:
8fe8f5fa9b
Change-Id: I0a18edd6dc7347b7b08d59ab89f767b98fde1372
Tyler Gunn [Tue, 13 Feb 2018 09:46:21 +0000 (09:46 +0000)]
Merge "Updates to Telecom API docs for clarity."
am:
e845bddb40
Change-Id: I9b988dc7e70b9b9f1c30fa6991d841183850a49a
Colin Cross [Tue, 13 Feb 2018 07:51:59 +0000 (07:51 +0000)]
Merge "Don't put android.os.Parcelable in framework.aidl" am:
0872f6d5e3
am:
6864210fe2
Change-Id: I17a5277ece615569670f5f8ea9c2ed42fb473a52
Colin Cross [Tue, 13 Feb 2018 07:29:51 +0000 (07:29 +0000)]
Merge "Don't put android.os.Parcelable in framework.aidl"
am:
0872f6d5e3
Change-Id: I3f6344774b44b43e2ec18f56c0a49fffc58a8629
Treehugger Robot [Tue, 13 Feb 2018 07:09:36 +0000 (07:09 +0000)]
Merge "Updates to Telecom API docs for clarity."
Jack Yu [Tue, 13 Feb 2018 00:49:42 +0000 (00:49 +0000)]
Merge "Added owners" am:
492f249dbb
am:
ea014edb58
Change-Id: I6c7ff430af33899c534a9f70139ef7cf6cc1cfbf
Jack Yu [Tue, 13 Feb 2018 00:35:49 +0000 (00:35 +0000)]
Merge "Added owners"
am:
492f249dbb
Change-Id: Ib499c266a78bcae2fb779b3782ef82a92d843d4b
Tyler Gunn [Thu, 8 Feb 2018 19:28:33 +0000 (11:28 -0800)]
Updates to Telecom API docs for clarity.
- Update Connection onAnswer/onReject docs to make it more clear for
a self-managed connectionservice that these methods could be called by
the framework or by a car mode in call service.
- Update the Connection onShowIncomingCallUI method to take into account
the new concurrent calling capabilities in P.
Test: Docs only change
Bug:
73112552
Change-Id: Icb47aa15d03d4bfc05380948e30686317124301e
Treehugger Robot [Mon, 12 Feb 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Don't put android.os.Parcelable in framework.aidl"
Jack Yu [Mon, 12 Feb 2018 22:39:00 +0000 (22:39 +0000)]
Merge "Added owners"
Tyler Gunn [Thu, 1 Feb 2018 16:58:38 +0000 (08:58 -0800)]
Rename Conference#setConnectionElapsedTime to clarity.
Change name of conference connection elapsed time method to make it more
clear what it is for. Updated documentation of this method and its
companion to make it more clear what they are for.
Test: Compile - this is a docs and naming change only.
Bug:
70639525
Change-Id: I02662cb0331cba0d1fe2d4353438a68f334f9192
Jordan Liu [Mon, 12 Feb 2018 20:19:37 +0000 (20:19 +0000)]
Merge "Overload setTelephonyProperty without phone ID" am:
f27242dbd6
am:
22189a729a
Change-Id: I9d8182751f5303258083e0b0d0825902d06225d1
Jack Yu [Mon, 12 Feb 2018 20:07:34 +0000 (12:07 -0800)]
Added owners
Test: Build
Change-Id: I95104f646bc054e4ad9a6807d6e3df69f1e00d75
Jordan Liu [Mon, 12 Feb 2018 20:06:06 +0000 (20:06 +0000)]
Merge "Overload setTelephonyProperty without phone ID"
am:
f27242dbd6
Change-Id: I75fdeb6067b2917899f8b54d3e2857beb5d13c52
Jordan Liu [Mon, 12 Feb 2018 18:17:24 +0000 (18:17 +0000)]
Merge "Overload setTelephonyProperty without phone ID"
hansson [Mon, 12 Feb 2018 15:10:22 +0000 (15:10 +0000)]
Merge "CtsShim: build tweaks for 64-bit only builds." am:
a869d14343
am:
a4428dc5e4
Change-Id: I7e9db0098aeb6069dcd1f048a0cd6f690c947815
hansson [Mon, 12 Feb 2018 14:57:46 +0000 (14:57 +0000)]
Merge "CtsShim: build tweaks for 64-bit only builds."
am:
a869d14343
Change-Id: I49f0696119d1aa52e420fa7c676a448d569ea941
hansson [Mon, 12 Feb 2018 10:48:30 +0000 (10:48 +0000)]
Merge "CtsShim: build tweaks for 64-bit only builds."
Ganesh Mahendran [Mon, 12 Feb 2018 07:36:03 +0000 (15:36 +0800)]
add swapPss of native process to totalSwapPss
Currently swapPss of native process is not counted into totalSwapPss.
This change fixes this.
Change-Id: Ia2d9261f91e969ceef0519ffec8c8ab5dbcb2a5e
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Pavlin Radoslavov [Sat, 10 Feb 2018 09:27:54 +0000 (09:27 +0000)]
Merge "Use proper string formatting for the "Active device" string" am:
1b5703f9e9
am:
7cb1dbd38a
Change-Id: I7b9eee4064112569c2dead6bc10d232d2b4cc118
Pavlin Radoslavov [Sat, 10 Feb 2018 09:16:20 +0000 (09:16 +0000)]
Merge "Use proper string formatting for the "Active device" string"
am:
1b5703f9e9
Change-Id: I53fcb586273b02339e83f2514274e3be662b67ba
Tyler Gunn [Sat, 10 Feb 2018 02:11:17 +0000 (02:11 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app." am:
6a3031713c
am:
07545d18a2
Change-Id: I040613717aef7626dff3eafb2f49c943255d5795
Treehugger Robot [Sat, 10 Feb 2018 02:05:12 +0000 (02:05 +0000)]
Merge "Use proper string formatting for the "Active device" string"
nharold [Sat, 10 Feb 2018 01:57:50 +0000 (01:57 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" am:
43699e90f3
am:
e736f83caf
Change-Id: If7330b4fdf5d2ccbddb590ab81a4b19c1f612b66
Tyler Gunn [Sat, 10 Feb 2018 01:52:07 +0000 (01:52 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app."
am:
6a3031713c
Change-Id: I08fb54de452d6f334232d24caf8f89caba85c515
nharold [Sat, 10 Feb 2018 01:46:00 +0000 (01:46 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
am:
43699e90f3
Change-Id: I1f286f0215ce88f947775ded0ddfbc8e0cd7bc55
Tyler Gunn [Sat, 10 Feb 2018 00:11:19 +0000 (00:11 +0000)]
Merge "Add Connection Event for supplementary service notifications." am:
efccc1babe
am:
4d2dae8f0c
Change-Id: Ide105970d9c91f2fa5e2ec14410da011918d92ec
Tyler Gunn [Sat, 10 Feb 2018 00:00:04 +0000 (00:00 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app."
Tyler Gunn [Fri, 9 Feb 2018 23:59:33 +0000 (23:59 +0000)]
Merge "Add Connection Event for supplementary service notifications."
am:
efccc1babe
Change-Id: Ia8f03045830032e42d2518e97fe74fd55734d524
nharold [Fri, 9 Feb 2018 23:36:59 +0000 (23:36 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
Pavlin Radoslavov [Tue, 6 Feb 2018 20:21:34 +0000 (12:21 -0800)]
Use proper string formatting for the "Active device" string
* The hard-coded "active" / "active(media)" / "active(phone)" strings
are removed and replaced with proper XML-based string formatting.
* Added the appropriate strings for Bluetooth Audio Active Device status:
"bluetooth_audio_active_device_summaries". For now those strings are
marked as translatable="false" until the actual UI is finalized.
* Updated all "bluetooth_connected*" strings to include the new
"active_device" component.
* Added unit tests for the new "active" strings.
Also, updated existing unit tests to check the getConnectionSummary()
strings by comparing against strings embedded within the unit tests.
Bug:
72317067
Test: Unit tests added: make RunSettingsLibRoboTests -j40
Manual: two headsets and switching the active device
Change-Id: Ide639b5dfb45c1db8114155240f193249aeaf3be
(cherry picked from commit
e6e080ff5cb9c7c56003695c1b787981e0114599)
Nick Butcher [Fri, 9 Feb 2018 22:42:26 +0000 (22:42 +0000)]
Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev
am:
35e1410551
Change-Id: If9f28bfe12d75fca6b8f07c15b77f78267ef6292
TreeHugger Robot [Fri, 9 Feb 2018 22:27:53 +0000 (22:27 +0000)]
Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev
Adam Lesinski [Fri, 9 Feb 2018 22:21:21 +0000 (22:21 +0000)]
Merge "Remove redundant final modifiers from api" am:
0ac66edaea
am:
42b86e3dec
Change-Id: If8366b5803f9d063d7c8131272a398983e93fde6
Tyler Gunn [Fri, 9 Feb 2018 22:10:50 +0000 (22:10 +0000)]
Merge "Add Connection Event for supplementary service notifications."
Andreas Gampe [Fri, 9 Feb 2018 22:09:07 +0000 (22:09 +0000)]
Merge "Watchdog: Print annotated stack trace, if possible" am:
2bd33a69d9
am:
0bc85c4e4d
Change-Id: I88e72448c88e6948de3f6d2e6f0f20d1a39a31a1
Adam Lesinski [Fri, 9 Feb 2018 22:00:21 +0000 (22:00 +0000)]
Merge "Remove redundant final modifiers from api"
am:
0ac66edaea
Change-Id: I69d90dc2869943544e88ed01391d4a6b1107aa90