OSDN Git Service
Felipe Leme [Tue, 15 Aug 2017 21:32:44 +0000 (21:32 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
am:
36cbdef880
Change-Id: I212780e8c7105aacaa15b292b36294166065219e
Charles He [Tue, 15 Aug 2017 21:15:55 +0000 (21:15 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
am:
0fa9328b80
Change-Id: Ib96af1de1b8205fd5d62c188bf47bc789ff6930e
TreeHugger Robot [Tue, 15 Aug 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
Tony Mak [Tue, 15 Aug 2017 20:59:38 +0000 (20:59 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
am:
0e1976292d -s ours
Change-Id: I05e3a2b19a2a9974f93a6d24ee3634fa357b3937
Android Build Merger (Role) [Tue, 15 Aug 2017 20:47:03 +0000 (20:47 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
Charles He [Tue, 15 Aug 2017 20:42:11 +0000 (20:42 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
am:
159cd14334
Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
Android Build Merger (Role) [Tue, 15 Aug 2017 20:35:00 +0000 (20:35 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
Change-Id: I4531fab8eab2291fcfd790d04a2661307f40dc60
Tony Mak [Tue, 15 Aug 2017 20:29:29 +0000 (20:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
am:
f3589fded1 -s ours
Change-Id: I3b60e5cb94895fc155ba11d27ed81640eb8a2a05
Brad Ebinger [Tue, 15 Aug 2017 18:12:12 +0000 (18:12 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" am:
53e82a9cd0
am:
b943ccef3c
Change-Id: Ief4564d711014cd5c139eea3dd89e18af03bf2bd
Brad Ebinger [Tue, 15 Aug 2017 18:04:18 +0000 (18:04 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
am:
53e82a9cd0
Change-Id: I3bafca03e20ef114588145982985411882d2c8f5
Charles He [Tue, 15 Aug 2017 17:54:35 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
Charles He [Tue, 15 Aug 2017 17:54:05 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
Charles He [Tue, 15 Aug 2017 17:53:35 +0000 (17:53 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
Charles He [Tue, 15 Aug 2017 17:52:57 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Lorenzo Colitti [Tue, 15 Aug 2017 02:16:18 +0000 (02:16 +0000)]
Merge changes I82d3bee0,I9c9413d7 am:
deb4eb5d05
am:
51c3d6a8bf
Change-Id: Ie7e8806faecdad96b4033404709fb3aebc4bdd0f
Lorenzo Colitti [Tue, 15 Aug 2017 02:07:36 +0000 (02:07 +0000)]
Merge changes I82d3bee0,I9c9413d7
am:
deb4eb5d05
Change-Id: Iaa6aecf3ec3a91dc04f4533c0ea5b649bdfeb83d
Lorenzo Colitti [Tue, 15 Aug 2017 01:57:28 +0000 (01:57 +0000)]
Merge changes I82d3bee0,I9c9413d7
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
nharold [Tue, 15 Aug 2017 01:37:21 +0000 (01:37 +0000)]
Merge "Cleanup ServiceState.toString()" am:
ee6e43c033
am:
5b30d7b819
Change-Id: I2edcce0e4e66dbb5840db7f2d3c6c0fa0855f09e
nharold [Tue, 15 Aug 2017 01:29:00 +0000 (01:29 +0000)]
Merge "Cleanup ServiceState.toString()"
am:
ee6e43c033
Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
nharold [Tue, 15 Aug 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Cleanup ServiceState.toString()"
Tyler Gunn [Tue, 15 Aug 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete." am:
58b77aa4aa
am:
c37cdd7c55
Change-Id: I425185aaa78608fd65615609acb90715a15a7c4a
huiwan [Tue, 15 Aug 2017 00:19:14 +0000 (00:19 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0" am:
4a41744919
am:
c970268397
Change-Id: I00e35784a1da7896f37dabe65e204724f8898677
Tyler Gunn [Tue, 15 Aug 2017 00:14:36 +0000 (00:14 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
am:
58b77aa4aa
Change-Id: I62e0700b9a94d3b17b2d32d16adb488519f6ff66
Tyler Gunn [Tue, 15 Aug 2017 00:13:21 +0000 (00:13 +0000)]
Merge "Add config option to enable/disable pause workaround." am:
9282d725f0 -s ours
am:
1a6b0a8ad3 -s ours
Change-Id: Ie1cd0988da85a241916cdd710cbcc5a06c647331
huiwan [Mon, 14 Aug 2017 23:59:13 +0000 (23:59 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
am:
4a41744919
Change-Id: I3b704d0f3e27bb26e00c60cd22145767d6c08335
Tyler Gunn [Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)]
Merge "Add config option to enable/disable pause workaround."
am:
9282d725f0 -s ours
Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d
Tyler Gunn [Mon, 14 Aug 2017 21:24:18 +0000 (21:24 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
Nathan Harold [Wed, 2 Aug 2017 17:51:47 +0000 (10:51 -0700)]
Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.
Bug:
64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
Treehugger Robot [Mon, 14 Aug 2017 19:57:26 +0000 (19:57 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
Tyler Gunn [Fri, 12 May 2017 17:04:49 +0000 (10:04 -0700)]
Add ConnectionService callback invoked when connection creation complete.
Adding a new @hide callback in ConnectionService which a CS implementation
can implement. A callback from Telecom is responsible for invoking this
method.
Test: Manual
Bug:
33272455
Change-Id: Id17cf0fd8fd491b7677f9b7a7b52c76270b1c8c9
Brad Ebinger [Fri, 30 Jun 2017 22:34:32 +0000 (15:34 -0700)]
Adds a new string definition for IMS Access blocked reason
When a call is disconnected with the Telephony DisconnectCause
IMS_ACCESS_BLOCKED, DisconnectCause#getReason will now return
the reason REASON_IMS_ACCESS_BLOCKED.
Bug:
33821263
Test: manual tests
Merged-In: Ic8b76e83aa8eb20074862f0e67734d2c5389ba12
Change-Id: Ic17cefa35a51f739c893923a2db7f3dca8ada202
Treehugger Robot [Mon, 14 Aug 2017 16:29:04 +0000 (16:29 +0000)]
Merge "Add config option to enable/disable pause workaround."
Felipe Leme [Tue, 1 Aug 2017 01:01:15 +0000 (18:01 -0700)]
Additional documentation about Autofill / WebView security.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes:
64114048
Fixes:
64337380
Fixes:
64125551
Change-Id: I375bb4712af875251fea4f3e572d92165643409a
Lorenzo Colitti [Fri, 11 Aug 2017 04:47:49 +0000 (13:47 +0900)]
Pass data usage limits to tethering offload code.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I82d3bee030bafa8fe85855885b5fc3893e699181
Lorenzo Colitti [Mon, 14 Aug 2017 04:07:42 +0000 (13:07 +0900)]
Don't time out when fetching tether offload stats.
Currently, fetching tethering offload stats has a 1000ms timeout,
after which we return stats of zero. However, returning zero is
invalid and will cause various parts of the network stats
accounting code to complain that statistics are moving backwards,
causing at least a log.wtf, and possibly a crash.
This CL removes the timeout entirely.
An alternative would have been to keep the timeout and return
null if the stats fetch failed. However, this complicates the
code, and if the HAL is persistently slow, could cause no stats
to be counted, ever. Given the impact of such behaviour on users'
data plans it is likely better to block until the stats are
collected.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I9c9413d757f44e87a51ea7ca82b657cc6aa0d4ba
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Merged-In: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Joachim Sauer [Mon, 14 Aug 2017 12:39:15 +0000 (12:39 +0000)]
Merge "API updated for ICU4J 59.1" am:
365178394d
am:
b418181e01
Change-Id: I6cf0840b5a8d1e32e0e872e44aa381f2c6ee15f8
Joachim Sauer [Mon, 14 Aug 2017 12:28:51 +0000 (12:28 +0000)]
Merge "API updated for ICU4J 59.1"
am:
365178394d
Change-Id: I74a98d63f9f170f6401a87c559fd0eccf06cb8f2
Joachim Sauer [Mon, 14 Aug 2017 12:19:39 +0000 (12:19 +0000)]
Merge "API updated for ICU4J 59.1"
huiwan [Tue, 1 Aug 2017 05:21:13 +0000 (13:21 +0800)]
PrintSpooler: fix monkey crash if height&width small than 0
During the monkey test, should add check height & width before
create the bitmap, to avoid the monkey test fail.
Change-Id: I5619c30af63afa3d74d0417e37c67c4920e099ba
Test: build & run
Steven Moreland [Fri, 11 Aug 2017 21:59:58 +0000 (21:59 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
am:
e59c1b1b50
Change-Id: Ic38b5d25594949241467f4271475e9f4503397b1
Steven Moreland [Fri, 11 Aug 2017 21:51:12 +0000 (21:51 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
am:
e17aa09136
Change-Id: Ic9b83ef13c9063f70c1d8af6ab95085f17afa4be
Steven Moreland [Fri, 11 Aug 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:38:39 +0000 (21:38 +0000)]
Revert "aapt2_jni: use proper nativehelper headers"
This reverts commit
8eebd694e59fb01c13267c509ea98179f149e69b.
Reason for revert: TH skipped PS run
Change-Id: Iab0e71d985819880146476ba3648e8b94201a839
TreeHugger Robot [Fri, 11 Aug 2017 21:35:31 +0000 (21:35 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594
am:
e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
Tony Mak [Fri, 11 Aug 2017 21:13:21 +0000 (21:13 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
Change-Id: I3d7846f3b82dd429c69cff700e3d2794039b73db
Tony Mak [Fri, 11 Aug 2017 21:12:38 +0000 (21:12 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc
Change-Id: Iea1acc1d757871aaaa58fb27f547fd6261b73585
Tony Mak [Fri, 11 Aug 2017 21:11:51 +0000 (21:11 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc
Change-Id: I4ab24abc5c58022d92eb399750c8c8ef07995c5b
Tony Mak [Fri, 11 Aug 2017 21:10:58 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a
Change-Id: Ic65e9bb19e46a8d16406a3d02e5b60f375338334
Tony Mak [Fri, 11 Aug 2017 21:09:58 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
Tony Mak [Fri, 11 Aug 2017 21:09:21 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7
Change-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b
Steven Moreland [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
am:
75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
Cindy Kuang [Fri, 11 Aug 2017 21:06:56 +0000 (21:06 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
Cindy Kuang [Fri, 11 Aug 2017 20:45:24 +0000 (20:45 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I7138667ba48fa590c4a7f30cdecf0381c43050a6
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am:
3f378940c2
Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Tyler Gunn [Fri, 11 Aug 2017 18:47:18 +0000 (18:47 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed
am:
63769af59d
Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Steven Moreland [Fri, 11 Aug 2017 18:01:23 +0000 (11:01 -0700)]
aapt2_jni: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using aapt2_jni find headers
Bug:
63762847
Change-Id: Id51354d533bfef66ecd71f5d89599b8adc688c1f
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
Esteban Talavera [Fri, 11 Aug 2017 12:34:06 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3
Change-Id: I0183d9fb699f38af155c3684cc74daa875c22ec4
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
Steven Moreland [Fri, 11 Aug 2017 01:08:37 +0000 (18:08 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Brad Ebinger [Fri, 11 Aug 2017 00:55:01 +0000 (00:55 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7
am:
44da663308
Change-Id: I7d68f608242c81c7be1da1c83669baf38b9e9fcc
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d
am:
bc13df8ce8
Change-Id: I7d73cade826c47b902c875b9543cb50fb19631d9
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Cindy Kuang [Wed, 9 Aug 2017 17:08:15 +0000 (10:08 -0700)]
docs: replaced "i.e." to fix formatting error
Test: make ds-docs
Bug:
6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
Amit Mahajan [Thu, 10 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d
am:
cfbd4a354a
Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544
Amit Mahajan [Thu, 10 Aug 2017 16:20:16 +0000 (16:20 +0000)]
Merge "Get isim card data use subId." am:
854edcff16
am:
3466cda3d7
Change-Id: I84d8b0fd15e50706e59577941428e5f5e81fa373
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am:
cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]
Merge "Get isim card data use subId."
am:
854edcff16
Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.
Bug:
62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
Erik Kline [Wed, 9 Aug 2017 22:34:49 +0000 (22:34 +0000)]
Merge "Add future consideration for USB rndis notification handling" am:
4263a5ed58
am:
6ff0730158
Change-Id: I2e755679bfea1cdb86a645948b32820c2d8dbf50
Erik Kline [Wed, 9 Aug 2017 22:23:24 +0000 (22:23 +0000)]
Merge "Add future consideration for USB rndis notification handling"
am:
4263a5ed58
Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6
Treehugger Robot [Wed, 9 Aug 2017 22:10:19 +0000 (22:10 +0000)]
Merge "Add future consideration for USB rndis notification handling"
Cindy Kuang [Wed, 9 Aug 2017 21:49:19 +0000 (14:49 -0700)]
docs: corrected grammar mistake in Class Overview
Test: make ds-docs
Bug:
17533073
Change-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82
Vinay Kalia [Wed, 9 Aug 2017 21:10:53 +0000 (21:10 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am:
6e749c392b
Change-Id: Id43b33865e287ec19a2ae4c56815d12bb402ab09
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling
Test: builds
Bug:
63970368
Merged-In: If6afe1cdce9995251ba53fbf30acf9d6e31f9433
Merged-In: I78e280c2299ec3f4d97138ca648f9629ba82e87f
Merged-In: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
(cherry picked from commit
1290568110405fd45f13824e67beeb98c30400a4)
Jakub Pawlowski [Wed, 9 Aug 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification" am:
c7da241b3e
am:
3ee6eed62f
Change-Id: If599de8cb4b5dc5531a5ce895b60c712108c5d3b
Erik Kline [Wed, 9 Aug 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." am:
d27af8af62
am:
47f2cf5144
Change-Id: I5d9f5cd7942547d4b9c11a5b3cc56799c92cd62a
Tyler Gunn [Wed, 9 Aug 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis." am:
647b520a00
am:
8adf430f30
Change-Id: I2a8dc4f0ba5c002b184d7192ed86e7c7fe1a705d
Jakub Pawlowski [Wed, 9 Aug 2017 19:15:08 +0000 (19:15 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
am:
c7da241b3e
Change-Id: Iaf58ace037810d11fcb29c2696c79664d601e87c
Erik Kline [Wed, 9 Aug 2017 19:12:23 +0000 (19:12 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
am:
d27af8af62
Change-Id: I33633e064a329b9094b0d279622febab6266e5cb
Tyler Gunn [Wed, 9 Aug 2017 19:03:32 +0000 (19:03 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
am:
647b520a00
Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471
OSDN Git Service
