Ruben Brunk
3de064f7cc
Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
...
am: c765c2c448
Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
2017-10-05 04:03:03 +00:00
Ruben Brunk
52ea662280
Bind VR compositor service from VrManagerService.
...
- Allow VR system application to have VR manager service bind a
compositor process so that oom scoring for the compositor process can be
adjusted.
Bug: 38390640
Test: Check that the VrCore compositor process is -700 on AIO devices with:
adb shell procrank -o
Change-Id: I7b5bce5eb87bd5ed0fdeadf4ec7bdd2b361ab875
2017-10-03 20:58:30 -07:00
Brad Ebinger
548a7e607d
Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97
...
am: 6ed82dc67b
Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
2017-10-03 21:23:01 +00:00
Brad Ebinger
6ed82dc67b
Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211
...
am: 387b90aa97
Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857
2017-10-03 21:13:34 +00:00
Brad Ebinger
387b90aa97
Merge "Adds a filtering bitmask to DownloadStateCallback"
...
am: 177bd65211
Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
2017-10-03 20:55:50 +00:00
Brad Ebinger
177bd65211
Merge "Adds a filtering bitmask to DownloadStateCallback"
2017-10-03 20:23:00 +00:00
Brad Ebinger
5fc881f7e7
Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a
...
am: 4b76f8420f
Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
2017-10-03 19:07:46 +00:00
Brad Ebinger
4b76f8420f
Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028
...
am: 768b6c5e4a
Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe
2017-10-03 18:58:11 +00:00
Brad Ebinger
768b6c5e4a
Merge "Decouple Content Name Locale from Content Language Locale"
...
am: a830e83028
Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
2017-10-03 18:45:43 +00:00
Brad Ebinger
a830e83028
Merge "Decouple Content Name Locale from Content Language Locale"
2017-10-03 18:31:49 +00:00
Brad Ebinger
c74ae34ddb
Adds a filtering bitmask to DownloadStateCallback
...
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.
Test: Testapps
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-03 09:48:51 -07:00
Orion Hodson
93dd29d110
Merge "Update dalvik.bytecode package" am: 537d63fe1a am: 7e806c2942
...
am: a17b99f75f
Change-Id: I4d15c973ed09593e9c91f4bd40f8efa65b1d516c
2017-10-03 08:24:07 +00:00
Orion Hodson
a17b99f75f
Merge "Update dalvik.bytecode package" am: 537d63fe1a
...
am: 7e806c2942
Change-Id: I1fb0eebc7b345d9b21b10a4b9511d91e61a45046
2017-10-03 08:15:45 +00:00
Orion Hodson
7e806c2942
Merge "Update dalvik.bytecode package"
...
am: 537d63fe1a
Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18
2017-10-03 08:06:57 +00:00
Brad Ebinger
d01f6eec20
Decouple Content Name Locale from Content Language Locale
...
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.
Test: Manual
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-09-29 15:34:50 -07:00
Jorim Jaggi
e25ff3130e
Merge "Add API to request light navigation bar in theme" into oc-mr1-dev
...
am: e1cf112b6c
Change-Id: I7646845711ed39ff47269dc3a7a5e93b06c1b8a1
2017-09-28 16:38:38 +00:00
Jorim Jaggi
6c7776ffe2
Add API to request light navigation bar in theme
...
Such that splash screens can already have a light navigation bar,
avoiding a janky flash.
Test: CtsSystemUiTestCases
Bug: 66986286
Bug: 63630024
Change-Id: I0b89c58e9fbca08e27a6ec13db5a07f5e030c682
Merged-In: I81b34fefeb336ac2269dc5e6b98cc0b6045cea70
2017-09-28 16:23:39 +00:00
Orion Hodson
466f92d97b
Update dalvik.bytecode package
...
BUG: 66562179
Test: m checkapi
Change-Id: Ifeecbecbd7334b55126b6e0f51eb5e8b516e341a
2017-09-27 13:55:38 +01:00
nharold
80b90ed99a
Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a
...
am: 80107540bb
Change-Id: I13a7134864a648aff9338fda044b3bffd653119e
2017-09-26 22:39:01 +00:00
nharold
80107540bb
Merge changes from topic "re-enable-ipsec" am: 680525c742
...
am: 8d306cd78a
Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
2017-09-26 22:24:02 +00:00
nharold
8d306cd78a
Merge changes from topic "re-enable-ipsec"
...
am: 680525c742
Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
2017-09-26 22:13:20 +00:00
nharold
680525c742
Merge changes from topic "re-enable-ipsec"
...
* changes:
Re-Expose IpSecService API Surface
Re-Enable Starting of the IpSecService
2017-09-26 21:46:39 +00:00
Charles He
01014743c0
Merge changes from topic "always-on-vpn" am: cc15c7f8c1
...
am: 692b55390f
Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
2017-09-19 08:09:41 +00:00
Charles He
692b55390f
Merge changes from topic "always-on-vpn"
...
am: cc15c7f8c1
Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
2017-09-19 08:01:45 +00:00
Charles He
cc15c7f8c1
Merge changes from topic "always-on-vpn"
...
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
2017-09-19 07:50:13 +00:00
Pengquan Meng
f05a01caf3
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
...
am: b3bc234dfa
Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
2017-09-19 01:38:10 +00:00
Pengquan Meng
b3bc234dfa
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89
...
am: 74bd3daaac
Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446
2017-09-19 01:31:24 +00:00
Pengquan Meng
74bd3daaac
Merge "Incorrect decoding when TP-OA contains non-integer information"
...
am: 2bcc7fac89
Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8
Incorrect decoding when TP-OA contains non-integer information
...
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.
This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0
Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
information in the semi-octets other than "1111" (e.g. 1110)
it shall display the semi-octet as the representation given
in GSM 44.008 [12] under "called BCD number", viz 1010="*",
1011="#", 1100="a", 1101="b", 1110="c"."
Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Hall Liu
3715bced3a
Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb
...
am: 7fd9aa2654
Change-Id: I6764968b4b3f71be799b0a5e835fdc3624849364
2017-09-15 03:26:50 +00:00
Hall Liu
3e0f22f676
Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce
...
am: febecb8218
Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
2017-09-15 03:22:23 +00:00
Hall Liu
7fd9aa2654
Merge "API council suggested edits, part 3" am: 7a4cc05d45
...
am: 4c4fb3bdfb
Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f
2017-09-15 01:54:30 +00:00
Hall Liu
febecb8218
Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd
...
am: 3934c475ce
Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058
2017-09-15 01:35:37 +00:00
Hall Liu
4c4fb3bdfb
Merge "API council suggested edits, part 3"
...
am: 7a4cc05d45
Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
2017-09-15 00:45:05 +00:00
Hall Liu
3934c475ce
Merge "Apply suggested edits to the file-download API"
...
am: f6c9baa0cd
Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
2017-09-15 00:40:49 +00:00
Hall Liu
e373ee5d5c
API council suggested edits, part 3
...
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 14:51:32 -07:00
Hall Liu
23d80af5c1
Apply suggested edits to the file-download API
...
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 14:37:47 -07:00
Hall Liu
9408a33b7e
Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242
...
am: 4de6420978
Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
2017-09-14 20:11:32 +00:00
Hall Liu
4de6420978
Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859
...
am: 200d8f6242
Change-Id: Iebea130f19c60c407a95ff1c1a3f80abd7c66925
2017-09-14 19:57:36 +00:00
Hall Liu
200d8f6242
Merge "Make changes to MBMS Streaming APIs per recommendations"
...
am: 1bbf287859
Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
2017-09-14 19:45:04 +00:00
Hall Liu
1bbf287859
Merge "Make changes to MBMS Streaming APIs per recommendations"
2017-09-14 19:34:11 +00:00
Hall Liu
ca077a992d
Merge "Unhide EMBMS download API" am: 0285ee851d am: e9b31e8eaf
...
am: c55378fad4
Change-Id: Ib2a05680a219c45705db30420787d1b8ed827cca
2017-09-14 10:30:06 +00:00
Hall Liu
c55378fad4
Merge "Unhide EMBMS download API" am: 0285ee851d
...
am: e9b31e8eaf
Change-Id: I21ff320916c218e8f215116ab7046f5075067300
2017-09-13 22:47:17 +00:00
Hall Liu
e9b31e8eaf
Merge "Unhide EMBMS download API"
...
am: 0285ee851d
Change-Id: Ib94f80270615f3d4a710c31b6ab81b40d77333ad
2017-09-13 22:22:04 +00:00
Hall Liu
0285ee851d
Merge "Unhide EMBMS download API"
2017-09-13 20:40:34 +00:00
Nathan Harold
d999d225a8
Re-Expose IpSecService API Surface
...
Note, This reverts commit bd62d6aff2 .
Bug: 64800246
Test: compilation
Change-Id: I709d4c476647cfe9f6b982fc373f8d76018b3922
2017-09-12 19:25:13 -07:00
nharold
94a3a079c3
Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c am: 447b7c49fc
...
am: 95fe8c1312
Change-Id: I514d635abcb039efa1cc218fe28ba0ed979b9bf7
2017-09-11 18:27:48 +00:00
nharold
95fe8c1312
Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c
...
am: 447b7c49fc
Change-Id: I5c1738fca4a43b0e8c1ddd0041a00f96d32142e8
2017-09-11 18:17:03 +00:00
nharold
447b7c49fc
Merge "Un-hide TelephonyManager.getSignalStrength()"
...
am: 3e884ce13c
Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972
2017-09-11 18:07:07 +00:00
nharold
3e884ce13c
Merge "Un-hide TelephonyManager.getSignalStrength()"
2017-09-11 17:44:34 +00:00