OSDN Git Service
Etan Cohen [Thu, 8 Feb 2018 01:57:02 +0000 (01:57 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da am:
ff94c32675 am:
1c490515bd
am:
7c4da1ce2b
Change-Id: I07b03c420bb55f3b5136f316fa8e58316ba5deac
Ryan Lothian [Thu, 8 Feb 2018 01:37:16 +0000 (01:37 +0000)]
Merge "Handle onBindingDied in notification manager" into oc-mr1-dev
am:
f638a39149
Change-Id: If5aedb5832ece597bd9138bae9c0fd5ba1851f4a
Pooja Jain [Thu, 8 Feb 2018 01:27:45 +0000 (01:27 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature" am:
ba0f9d2973
am:
f39bef4801
Change-Id: I843ae3caed5b066398e76825ea4e2753904b1f54
Etan Cohen [Thu, 8 Feb 2018 01:11:51 +0000 (01:11 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev am:
d05a3078fc am:
0d2044af4b
am:
f1ff948671
Change-Id: Ia9ca0839e05779d02560b07e1ab7103d9779c06e
Pooja Jain [Thu, 8 Feb 2018 01:00:43 +0000 (01:00 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
am:
ba0f9d2973
Change-Id: I6e209e21e46ce8127019d08cf59bda5d5bdd919e
Etan Cohen [Thu, 8 Feb 2018 00:42:11 +0000 (00:42 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da am:
ff94c32675
am:
1c490515bd
Change-Id: I3581a6741418cfa0b59b48098511d9a295f3023a
TreeHugger Robot [Thu, 8 Feb 2018 00:18:26 +0000 (00:18 +0000)]
Merge "Handle onBindingDied in notification manager" into oc-mr1-dev
Etan Cohen [Thu, 8 Feb 2018 00:13:33 +0000 (00:13 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da
am:
ff94c32675
Change-Id: Ieeb0c8b9f7ed9694d4f1bbd8399a80d146eb8eb8
Etan Cohen [Thu, 8 Feb 2018 00:03:07 +0000 (00:03 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev am:
d05a3078fc
am:
0d2044af4b
Change-Id: I7f622c50449e231d3bcf32dc3fee5ba2f14f8da1
Etan Cohen [Wed, 7 Feb 2018 23:43:32 +0000 (23:43 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev
am:
d05a3078fc
Change-Id: I446c693cfd86954f789db4fbc6d11d6954c6d343
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:35 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da
Change-Id: Ie42ef0c2866bd9b0da38a674dce45ef25db225e5
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:30 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314
Change-Id: Ib885bd161e80cbca44c7dba902f16e761a60e4eb
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:24 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683
Change-Id: I6efeff8c88619977284067b46080f9df54d73fba
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:19 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e
Change-Id: I4431d2adcde5e2c1308a48a90a01d9e324b2c5cd
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:14 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5
Change-Id: I8732629d97566fe507b87e333dc2a7ce562c7b38
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:59 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1
Change-Id: I5d1adb5f7d6d5eb3ba584033453bf4766b5fd300
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:52 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374
Change-Id: I9a94eac5fa1b832b4334e08676b2be7a032c3efc
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:42 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be
Change-Id: Idfec393662af2392aba6949d7ffcad720b4d4eb6
Etan Cohen [Wed, 7 Feb 2018 23:21:17 +0000 (23:21 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
am:
e137462b2c
Change-Id: I4132c2ccfc0db161c6a89a6c62fb276f0874d39b
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d am:
7ae0c44ca4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-f-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
Rubin Xu [Wed, 7 Feb 2018 22:31:21 +0000 (22:31 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926 am:
469065ccb7 am:
bf1ecab901 am:
7ac2108ed3
am:
a7483c90c1
Change-Id: I04733e3924d0530300106f5897771adf8a4db391
Treehugger Robot [Wed, 7 Feb 2018 22:25:04 +0000 (22:25 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
Rubin Xu [Wed, 7 Feb 2018 22:14:48 +0000 (22:14 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926 am:
469065ccb7 am:
bf1ecab901
am:
7ac2108ed3
Change-Id: Ibae4cb0462cfcbc2296e71849387d0c0035d3cce
Rubin Xu [Wed, 7 Feb 2018 21:59:55 +0000 (21:59 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926 am:
469065ccb7
am:
bf1ecab901
Change-Id: Ibf8e444ab8e66a068174c30985e3056443db99fe
Ryan Lothian [Mon, 4 Dec 2017 16:56:58 +0000 (11:56 -0500)]
Handle onBindingDied in notification manager
On Android, if the process containing the service being bound to
crashes before the bind succeeds, the app doing the binding won't
get a success or failure callback.
When that happens in this code, this leaves notif. manager thinking
that a binding is in progress, so it never attempts to rebind until
the device is rebooted.
Bug:
69064494
Test: manual, crashed listener on proc start, verified not unbound forever
Change-Id: Id2082744208e21a709d9453365f282449a2e9407
(cherry picked from commit
4a86a51b672617b02994fc812e4f96342daf424e)
Martijn Coenen [Wed, 7 Feb 2018 16:21:01 +0000 (16:21 +0000)]
Merge "Fix gNumProxies double increment." am:
18f8500e32
am:
1b4f537429
Change-Id: I39f5db2bf430051d80ef27fe312cf3f397774edd
Martijn Coenen [Wed, 7 Feb 2018 16:12:04 +0000 (16:12 +0000)]
Merge "Fix gNumProxies double increment."
am:
18f8500e32
Change-Id: I1cc29693fd50fc033342c592841a17dbd5b9d532
Martijn Coenen [Wed, 7 Feb 2018 13:47:45 +0000 (13:47 +0000)]
Merge "Fix gNumProxies double increment."
Martijn Coenen [Wed, 7 Feb 2018 09:25:39 +0000 (10:25 +0100)]
Fix gNumProxies double increment.
Bug:
70217678
Test: proxy counts look reasonable
Change-Id: I6147d6038794eabd6b3446d78cd29af9d40ef7cc
Android Build Merger (Role) [Wed, 7 Feb 2018 08:19:03 +0000 (08:19 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926 am:
469065ccb7
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:57 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:50 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:44 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:37 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:22 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]
Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.
Test: none
Bug:
71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
Pooja Jain [Thu, 28 Dec 2017 08:45:31 +0000 (14:15 +0530)]
IMS: Add support in frameworks for call deflection feature
Call deflection feature is useful to deflect MT call to another
number.
Test: Manual
Bug:
62170348
Change-Id: Idfbcc175a856aa0bb9476f8c73d7a614a3af0700
Jong Wook Kim [Wed, 7 Feb 2018 05:32:01 +0000 (05:32 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator" am:
9f16828767
am:
775861bb12
Change-Id: I6dba4e244c660d29f107e471250d39e9caafb17e
Jong Wook Kim [Wed, 7 Feb 2018 05:20:19 +0000 (05:20 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator"
am:
9f16828767
Change-Id: If35e07b78b17329a25cf78adbf3d8244af4a4f81
Gurpreet Ghai [Wed, 7 Feb 2018 04:12:12 +0000 (04:12 +0000)]
Merge "Fix ANR due to long wait for synchronization lock" am:
9193014ee6
am:
ad4e3c5d8b
Change-Id: Ib145ddd3769145f19387b438b55eaf495894ef4f
Siyuan Zhou [Wed, 7 Feb 2018 04:03:26 +0000 (04:03 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG." am:
1a535ba4b9
am:
1801988051
Change-Id: I6c9e33ae9fbec647ade9f4258aedfdf73f2883a2
Gurpreet Ghai [Wed, 7 Feb 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Fix ANR due to long wait for synchronization lock"
am:
9193014ee6
Change-Id: Ic41c34a5701658aa328a83267ad3c818d55bd522
Siyuan Zhou [Wed, 7 Feb 2018 03:52:30 +0000 (03:52 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG."
am:
1a535ba4b9
Change-Id: Iea3ef90603b4aa6da9a24839e8ec16a996a5d5e5
Jong Wook Kim [Wed, 7 Feb 2018 02:06:07 +0000 (02:06 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator"
Tobias Thierer [Wed, 7 Feb 2018 01:35:14 +0000 (01:35 +0000)]
Merge "Pin jarjar targets to java_version 1.8." am:
2bbf12aa78
am:
3f48e86917
Change-Id: I16ada1b29290bebda757b8f4fae457e27c249469
Jong Wook Kim [Thu, 1 Feb 2018 03:03:19 +0000 (19:03 -0800)]
MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator
Use SecureRandom instead of Random since Random is time based and can
increase the chance of generating same MAC address across multiple
devices.
createRandomUnicastAddress should randomize all bits of the address,
except for locally assigned bit and unicast bit. The previous method
that only randomizes NIC and use Google Base OUI is renamed to
createRandomUnicastAddressWithGoogleBase.
Bug:
72450936
Test: runtest frameworks-net
Change-Id: Icda650638c2c1c9fd90d509a87e86347c0e05f2d
Treehugger Robot [Wed, 7 Feb 2018 01:26:09 +0000 (01:26 +0000)]
Merge "Fix ANR due to long wait for synchronization lock"
Treehugger Robot [Wed, 7 Feb 2018 01:24:36 +0000 (01:24 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG."
Tobias Thierer [Wed, 7 Feb 2018 01:20:35 +0000 (01:20 +0000)]
Merge "Pin jarjar targets to java_version 1.8."
am:
2bbf12aa78
Change-Id: Ic5dbc60063d92bafca7fef8cebc03fe449ccc224
Tobias Thierer [Wed, 7 Feb 2018 00:16:04 +0000 (00:16 +0000)]
Merge "Pin jarjar targets to java_version 1.8."
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 23:36:52 +0000 (23:36 +0000)]
Merge "Update ServiceState to adapt NetworkService change." am:
1168c31c4a
am:
bc1ea668f9
Change-Id: I306cb270ed1d9286739117ea0f6cb5770108ba8e
Hall Liu [Tue, 6 Feb 2018 23:28:17 +0000 (23:28 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry"" am:
39393f889a
am:
772d17c263
Change-Id: I7e2fd26aad4c09bca97142279434fb108abae848
Malcolm Chen [Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)]
Merge "Add strings and carrier config needed network service." am:
a3ccb8d854
am:
0c2a5852f5
Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a
Colin Cross [Tue, 6 Feb 2018 23:06:08 +0000 (23:06 +0000)]
Merge "Add missing copyright messages" am:
872f386f6b
am:
32a1dc5075
Change-Id: I9602e1c9dda5e842fd71c9f48cf354aea4650d74
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 22:56:48 +0000 (22:56 +0000)]
Merge "Update ServiceState to adapt NetworkService change."
am:
1168c31c4a
Change-Id: Ibbe75b8f9f9498d71fda5e03932439c7832454a6
Hall Liu [Tue, 6 Feb 2018 22:50:34 +0000 (22:50 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
am:
39393f889a
Change-Id: I74a817ac04cc754a291521ae03fcf648b00494f9
Malcolm Chen [Tue, 6 Feb 2018 22:28:41 +0000 (22:28 +0000)]
Merge "Add strings and carrier config needed network service."
am:
a3ccb8d854
Change-Id: Id72bfe77c515028a055268bf9ba2d23e7b310d3e
Colin Cross [Tue, 6 Feb 2018 22:22:19 +0000 (22:22 +0000)]
Merge "Add missing copyright messages"
am:
872f386f6b
Change-Id: If54622ff6ed84dca262a8e65deb44bacbfc5b280
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 21:32:31 +0000 (21:32 +0000)]
Merge "Update ServiceState to adapt NetworkService change."
Hall Liu [Tue, 6 Feb 2018 21:15:42 +0000 (21:15 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
Treehugger Robot [Tue, 6 Feb 2018 20:57:25 +0000 (20:57 +0000)]
Merge "Add strings and carrier config needed network service."
Treehugger Robot [Tue, 6 Feb 2018 20:47:51 +0000 (20:47 +0000)]
Merge "Add missing copyright messages"
Colin Cross [Tue, 6 Feb 2018 19:10:25 +0000 (11:10 -0800)]
Add missing copyright messages
Bug:
72993971
Test: m sdkparcelables
Change-Id: I9fa422160c29ce3054748b2b8d1e26541a697a90
Hall Liu [Tue, 6 Feb 2018 18:13:36 +0000 (18:13 +0000)]
Revert "Check for location access on TelephonyRegistry"
This reverts commit
8d584f0a91b0709b28ebc64abf0a6063429c8d58.
Reason for revert: b/
72967560
Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
Paul Duffin [Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)]
Merge changes Ie05a1759,If3b6fc63 am:
1f14eab551
am:
73771adf83
Change-Id: Iadca3cac054e707d193a7d054d091a13c78e0cbe
Paul Duffin [Tue, 6 Feb 2018 15:34:34 +0000 (15:34 +0000)]
Merge "Correct inaccurate comments in build files" am:
f55f221805
am:
654f09c3dd
Change-Id: I7bb06fe6c2ecc81d7997c2efee8bfb029b61e994
Paul Duffin [Tue, 6 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge changes Ie05a1759,If3b6fc63
am:
1f14eab551
Change-Id: I259f07c37e2797f07b9bfdc13f5ebc0d05429877
Paul Duffin [Tue, 6 Feb 2018 15:25:51 +0000 (15:25 +0000)]
Merge "Correct inaccurate comments in build files"
am:
f55f221805
Change-Id: Iba1b710e00843d8c35c346d64d33250ce6654956
Treehugger Robot [Tue, 6 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge changes Ie05a1759,If3b6fc63
* changes:
Modify android.test.runner to use new mock APIs
Add apis needed for android.test.legacy
Paul Duffin [Tue, 6 Feb 2018 13:39:46 +0000 (13:39 +0000)]
Merge "Correct inaccurate comments in build files"
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.
This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
20af1df63f77f6b3ab12fd6221f581fe84182091)
Merged-In: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Change-Id: Ie05a17598fcabc1189cacc912c01a25782ebd29c
Paul Duffin [Wed, 31 Jan 2018 13:30:22 +0000 (13:30 +0000)]
Correct inaccurate comments in build files
Bug:
30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
772b6923206a34e97c45bc48e7ad4bebfd3eae29)
Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
Andreas Gampe [Tue, 6 Feb 2018 09:14:05 +0000 (09:14 +0000)]
Merge "Frameworks: Mark tests" am:
c86b195cd5
am:
2b12970061
Change-Id: I73c717b99b9660a11141b5392c6993ab9aabf85c
Andreas Gampe [Tue, 6 Feb 2018 09:04:38 +0000 (09:04 +0000)]
Merge "Frameworks: Mark tests"
am:
c86b195cd5
Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2
Treehugger Robot [Tue, 6 Feb 2018 06:03:09 +0000 (06:03 +0000)]
Merge "Frameworks: Mark tests"
Stanley Tng [Tue, 6 Feb 2018 03:27:07 +0000 (03:27 +0000)]
Merge "Add function to change LE Tx Data Length" am:
383a7d432f
am:
cffe307fa5
Change-Id: I02a15bfc36d8c8817c45e4c6f56ebbfbbf571338
Brad Ebinger [Tue, 6 Feb 2018 03:16:39 +0000 (03:16 +0000)]
Merge changes from topic "ims_apis" am:
de65acb915
am:
77230a0b3f
Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72
Brad Ebinger [Tue, 6 Feb 2018 03:11:36 +0000 (03:11 +0000)]
Make ImsService API @SystemApi am:
0e370b4a02
am:
a690700bca
Change-Id: Idd65b968636b4ee8bffe982afdb86f35db695ac2
Brad Ebinger [Tue, 6 Feb 2018 03:07:16 +0000 (03:07 +0000)]
Integrate new MMTel APIs into the framework am:
5b1883b5f1
am:
e904f40820
Change-Id: I3e6276418b2c6330bce65289f589980d4666de6a
Stanley Tng [Tue, 6 Feb 2018 03:06:49 +0000 (03:06 +0000)]
Merge "Add function to change LE Tx Data Length"
am:
383a7d432f
Change-Id: I5e4e634b7265d3673a2142fc629d381d4b16b491
Brad Ebinger [Tue, 6 Feb 2018 03:03:30 +0000 (03:03 +0000)]
Integrate ImsCallSessionListener API changes am:
6ed4ee6847
am:
d627bb5039
Change-Id: Ia445ff1153483813d29b85723437b356da9996e2
Stanley Tng [Tue, 6 Feb 2018 01:02:33 +0000 (01:02 +0000)]
Merge "Add function to change LE Tx Data Length"
Brad Ebinger [Mon, 5 Feb 2018 23:15:38 +0000 (23:15 +0000)]
Merge changes from topic "ims_apis"
am:
de65acb915
Change-Id: I717387907dde9f10fd61bbeb20e3533aeaeab220
Brad Ebinger [Mon, 5 Feb 2018 23:10:53 +0000 (23:10 +0000)]
Make ImsService API @SystemApi
am:
0e370b4a02
Change-Id: I7e0e8d26e842d78999138fe09e1fc9e5951a6506
Brad Ebinger [Mon, 5 Feb 2018 23:05:33 +0000 (23:05 +0000)]
Integrate new MMTel APIs into the framework
am:
5b1883b5f1
Change-Id: Id45f87f7399ddd8c2fd0046f5fa3f5364ec5f583
Brad Ebinger [Mon, 5 Feb 2018 22:59:45 +0000 (22:59 +0000)]
Integrate ImsCallSessionListener API changes
am:
6ed4ee6847
Change-Id: I41d63714efc2843fd7b1870fc99cefed074f91c3
Malcolm Chen [Tue, 30 Jan 2018 01:09:21 +0000 (17:09 -0800)]
Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.
Bug:
64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
Merged-In: Ifd557ce50a4419ead6125cda29c79d331508448e
OSDN Git Service
