Bill Yi
5fcfe617eb
Import translations. DO NOT MERGE am: 80d87da085 -s ours am: d250d3aa34 -s ours am: 09e6f1457b -s ours
...
am: 581e056425
2017-10-08 14:23:44 +00:00
Bill Yi
581e056425
Import translations. DO NOT MERGE am: 80d87da085 -s ours am: d250d3aa34 -s ours
...
am: 09e6f1457b
2017-10-08 14:16:28 +00:00
Bill Yi
09e6f1457b
Import translations. DO NOT MERGE am: 80d87da085 -s ours
...
am: d250d3aa34
2017-10-08 14:08:20 +00:00
Bill Yi
d250d3aa34
Import translations. DO NOT MERGE
...
am: 80d87da085
2017-10-08 14:00:50 +00:00
Bill Yi
e3dff12f80
Import translations. DO NOT MERGE
...
am: 87c4d55ccb
2017-10-08 07:11:31 +00:00
Bill Yi
80d87da085
Import translations. DO NOT MERGE
...
Change-Id: Ibfe6303b4d78d1ac0c8a0dbb235c6be683504018
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-07 21:49:36 -07:00
Bill Yi
87c4d55ccb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I944d5c1ac050fe65d777b815adb59f5d6536811a
2017-10-07 17:23:29 -07:00
Wenting Xiong
c2b9f772d0
Display "No service" on status bar when SIM unready
...
Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.
Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Change-Id: I65c24d3382c8c667eaab76a88e4a64853ca71e0d
2017-10-06 16:06:59 -07:00
Wenting Xiong
89f276b490
Display "No service" on status bar when SIM unready
...
am: b267ecde4b
2017-10-06 18:30:42 +00:00
Leon Scroggins III
6d3e25f36f
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d am: 54c2cbb0f9 am: 85a68d9e71 -s ours am: d9c818dce4 -s ours
...
am: 497520a1e8
2017-10-06 17:53:01 +00:00
Wenting Xiong
b267ecde4b
Display "No service" on status bar when SIM unready
...
Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.
Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Merged-In: I744ec9a3c70376199ba94d68331604276ea761c3
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3
2017-10-06 10:30:28 -07:00
Leon Scroggins III
497520a1e8
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d am: 54c2cbb0f9 am: 85a68d9e71 -s ours
...
am: d9c818dce4
2017-10-06 17:28:40 +00:00
Leon Scroggins III
d9c818dce4
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d am: 54c2cbb0f9
...
am: 85a68d9e71
2017-10-06 17:10:50 +00:00
Leon Scroggins III
85a68d9e71
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d
...
am: 54c2cbb0f9
2017-10-06 16:53:46 +00:00
Leon Scroggins III
54c2cbb0f9
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc
...
am: f32424b90d
2017-10-06 16:32:10 +00:00
Leon Scroggins III
f32424b90d
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
...
am: 2399d935bc
2017-10-06 16:18:49 +00:00
Leon Scroggins III
2399d935bc
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
...
am: cfe2352d88
2017-10-06 16:06:34 +00:00
TreeHugger Robot
cfe2352d88
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
2017-10-06 15:45:37 +00:00
Chalard Jean
06d401ae73
Merge "Add some useful helpers and constants." am: ed8d236319
...
am: 0f4421873e
2017-10-06 09:58:27 +00:00
Chalard Jean
0f4421873e
Merge "Add some useful helpers and constants."
...
am: ed8d236319
2017-10-06 09:48:32 +00:00
Chalard Jean
ed8d236319
Merge "Add some useful helpers and constants."
2017-10-06 09:37:38 +00:00
Erik Kline
35d9ddf06d
Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf992
...
am: cb2860362b
2017-10-06 09:34:49 +00:00
Erik Kline
cb2860362b
Merge "Log NAT update descriptions when receiving netlink errors"
...
am: 3506aaf992
2017-10-06 09:25:29 +00:00
Treehugger Robot
3506aaf992
Merge "Log NAT update descriptions when receiving netlink errors"
2017-10-06 09:16:18 +00:00
Erik Kline
4a8bcdef6d
Log NAT update descriptions when receiving netlink errors
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- new logging messages observed
2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 67396342
Merged-In: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
Merged-In: I426b0a0545d56aba7924c416799b37731e7e4b18
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
(cherry picked from commit a5ae9056e7
2017-10-06 16:56:06 +09:00
Chalard Jean
e5659bd316
Add some useful helpers and constants.
...
Test: Pulled out of a client app ; the client app is behaving
Test: identically to how it was behaving before. Wrote unit
Test: tests in frameworks-net.
Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7
2017-10-06 13:38:46 +09:00
Brad Ebinger
5b2afc8dab
Merge "Fix NPE when removing PIN locked SIM during E911 call" am: b7dc3a3b21
...
am: 4910739237
2017-10-06 04:03:51 +00:00
Brad Ebinger
4910739237
Merge "Fix NPE when removing PIN locked SIM during E911 call"
...
am: b7dc3a3b21
2017-10-06 03:54:29 +00:00
Treehugger Robot
b7dc3a3b21
Merge "Fix NPE when removing PIN locked SIM during E911 call"
2017-10-06 03:43:31 +00:00
Jordan Liu
a71be8e2f1
Merge "Display "No service" on status bar when SIM unready" am: a666dbb628 -s ours
...
am: e59a45f3ae
2017-10-06 03:35:53 +00:00
Jordan Liu
e59a45f3ae
Merge "Display "No service" on status bar when SIM unready"
...
am: a666dbb628
2017-10-06 03:25:25 +00:00
Jordan Liu
a666dbb628
Merge "Display "No service" on status bar when SIM unready"
2017-10-05 23:30:45 +00:00
Tobias Thierer
7c8e38c2cc
Merge "Fix documentation generation with OpenJDK 9 javadoc." am: ed6ae8f2b1
...
am: 8d4e36b1e8
2017-10-05 23:21:40 +00:00
Tobias Thierer
8d4e36b1e8
Merge "Fix documentation generation with OpenJDK 9 javadoc."
...
am: ed6ae8f2b1
2017-10-05 23:12:37 +00:00
Tobias Thierer
ed6ae8f2b1
Merge "Fix documentation generation with OpenJDK 9 javadoc."
2017-10-05 23:01:03 +00:00
Brad Ebinger
7130675c53
Fix NPE when removing PIN locked SIM during E911 call
...
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug: 66986066
Test: Manual, PIN/PUK locked SIM
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
2017-10-05 11:39:06 -07:00
dimitry
ef85667803
Merge "NativeActivity: Improve error message reporting" am: de3150db1e
...
am: 7de4dd6e07
2017-10-05 10:04:12 +00:00
dimitry
7de4dd6e07
Merge "NativeActivity: Improve error message reporting"
...
am: de3150db1e
2017-10-05 09:53:27 +00:00
Treehugger Robot
de3150db1e
Merge "NativeActivity: Improve error message reporting"
2017-10-05 09:44:21 +00:00
nharold
cc51ef0a47
Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d
...
am: 0bdb9a6e00
2017-10-05 00:55:38 +00:00
nharold
0bdb9a6e00
Merge "Cosmetic Cleanups for IpSecService"
...
am: 5ade9a228d
2017-10-05 00:44:37 +00:00
nharold
5ade9a228d
Merge "Cosmetic Cleanups for IpSecService"
2017-10-05 00:14:16 +00:00
nharold
4e793fd0b5
Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f
...
am: ae61e0c6e8
2017-10-04 20:35:20 +00:00
nharold
ae61e0c6e8
Merge changes from topic "ipsec-svc-cleanup"
...
am: 9778c7884f
2017-10-04 20:24:10 +00:00
Nathan Harold
d6f50b260d
Cosmetic Cleanups for IpSecService
...
This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup
Bug: 38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21
2017-10-04 13:04:55 -07:00
nharold
9778c7884f
Merge changes from topic "ipsec-svc-cleanup"
...
* changes:
Split IpSecServiceTest to add IPv6 Tests
Add equals() for IpSecAlgorithm and IpSecConfig
Input Validation for IpSecService
2017-10-04 20:00:52 +00:00
dimitry
f66a22335d
NativeActivity: Improve error message reporting
...
The error message is not necessary a dlerror(). For the devices with
native bridge it is reported by NB implementation.
Bug: http://b/67412560
Test: manual
Change-Id: I05377c3490199c40419831b5aae27cb30d4a321b
2017-10-04 19:48:11 +02:00
Jack He
5dfce858ea
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2
...
am: 8057ba832e
2017-10-04 17:42:26 +00:00
Jack He
8057ba832e
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
...
am: cfe51aabd2
2017-10-04 17:22:28 +00:00
Treehugger Robot
cfe51aabd2
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
2017-10-04 17:01:00 +00:00
