OSDN Git Service
Bill Yi [Sat, 3 Mar 2018 08:44:59 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours
am:
7e354b0ffe -s ours
Change-Id: Ic8151011ed5e74939d74d567765f10817abced9e
Bill Yi [Sat, 3 Mar 2018 08:22:31 +0000 (08:22 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec
am:
cfa5b7fa32
Change-Id: I12fa15bd34e438b3a26dbb0bcfafb2e6b0148deb
Bill Yi [Sat, 3 Mar 2018 08:15:59 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours
am:
d1ed6e90b2 -s ours
Change-Id: I6afd2c8ac6b486398cd0cc9d051d5ebef456bfaa
Bill Yi [Sat, 3 Mar 2018 08:15:40 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours
am:
3d12b053bc -s ours
Change-Id: Id2eeb3af6cd35bae85d1dedbcf8bf450534195b8
Bill Yi [Sat, 3 Mar 2018 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299
am:
585ba6b3ec
Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9
Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours
am:
6a223c3aaa -s ours
Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34
Bill Yi [Sat, 3 Mar 2018 07:55:51 +0000 (07:55 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90
am:
aed8d39fe7
Change-Id: Id390a60af18718f4eb375318c3ea8eb1a2f85e10
Bill Yi [Sat, 3 Mar 2018 07:49:05 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours
am:
db8a0233a4 -s ours
Change-Id: I8e64f428f1fc95d5387459a3f25c94e9bace9377
Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1
am:
bf7981bf90
Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e
Bill Yi [Sat, 3 Mar 2018 07:36:55 +0000 (07:36 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1
am:
0c557735b7
Change-Id: I84b3def855146d6db4d9bd623e9e96c89e8081d4
Bill Yi [Sat, 3 Mar 2018 07:30:57 +0000 (07:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours
am:
7d05ce8473 -s ours
Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b
Bill Yi [Sat, 3 Mar 2018 07:29:59 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours
am:
b90a10513e -s ours
Change-Id: Iebc8057fc5a7fb58e90bc71db5dd25a456583e12
Bill Yi [Sat, 3 Mar 2018 07:29:56 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
am:
4cd38db343 -s ours
Change-Id: I1800067c2cb7ca5de32951338f2548390c396fad
Bill Yi [Sat, 3 Mar 2018 07:17:16 +0000 (07:17 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
am:
13ac18d299
Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0
Bill Yi [Sat, 3 Mar 2018 07:16:45 +0000 (07:16 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3
am:
bad5ea4cb1
Change-Id: I4ab3e06e6a678dfff13d3ab205a497375b711f72
Bill Yi [Sat, 3 Mar 2018 07:15:14 +0000 (07:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
am:
dbea58fe4b -s ours
Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd
Bill Yi [Sat, 3 Mar 2018 07:11:41 +0000 (07:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours
am:
1f6fdce0b0 -s ours
Change-Id: I890e25939e0ca062b0be8c628089dbe455302fa2
Bill Yi [Sat, 3 Mar 2018 07:03:23 +0000 (07:03 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
am:
b59324afa1
Change-Id: I34809b7775652fa23e145a73647b67292f41f10e
Bill Yi [Sat, 3 Mar 2018 07:01:41 +0000 (07:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
am:
551e9b00ee -s ours
Change-Id: I482f064fca94761b7d01597177d7642629cf1553
Bill Yi [Sat, 3 Mar 2018 06:53:49 +0000 (06:53 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours am:
3d82e195f7 -s ours
am:
0f9e3adcda -s ours
Change-Id: I6adf3f79ffb510e4770e9e39dcb1b5fd55d304f3
Bill Yi [Sat, 3 Mar 2018 06:51:28 +0000 (06:51 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
am:
3850cf69e3
Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143
Masaho Nishikawa [Sat, 3 Mar 2018 06:51:01 +0000 (06:51 +0000)]
Merge "Add config to show an alert dialog for video charges" am:
1451124f86
am:
2c773d3f96
Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96
Bill Yi [Sat, 3 Mar 2018 06:49:53 +0000 (06:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
am:
ac782db7b2 -s ours
Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61
Bill Yi [Sat, 3 Mar 2018 06:48:20 +0000 (06:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours
am:
3d82e195f7 -s ours
Change-Id: Ie89698d2c1a3974e4721d9bcc36bc8141c91bd13
Masaho Nishikawa [Sat, 3 Mar 2018 06:39:45 +0000 (06:39 +0000)]
Merge "Add config to show an alert dialog for video charges"
am:
1451124f86
Change-Id: Idf89d421f3716dc00af97877d19d81445dd63f44
Bill Yi [Sat, 3 Mar 2018 06:37:52 +0000 (06:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
am:
fa863f597e -s ours
Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd
TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Import translations. DO NOT MERGE
nharold [Sat, 3 Mar 2018 05:13:16 +0000 (05:13 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength" am:
d5ba391425
am:
78f2c228d1
Change-Id: I4b821915c69aedd594747520186b2fb123d34b78
nharold [Sat, 3 Mar 2018 04:55:01 +0000 (04:55 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength"
am:
d5ba391425
Change-Id: I1cd2ae9a3110f6c49cacfc3137c009a1e04227ea
Treehugger Robot [Sat, 3 Mar 2018 03:30:19 +0000 (03:30 +0000)]
Merge "Add config to show an alert dialog for video charges"
nharold [Sat, 3 Mar 2018 03:14:22 +0000 (03:14 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength"
* changes:
Set CDMA Location to Invalid if on Null Island
Fix Range-Checking in CellSignalStrengthCdma
Fix CDMA Range Checks for SignalStrength
nharold [Sat, 3 Mar 2018 02:49:41 +0000 (02:49 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values" am:
a60e42cc2d
am:
f0b3b84a13
Change-Id: I074b386070118f8cac6efe3100ae88c378fd1a5e
nharold [Sat, 3 Mar 2018 02:33:59 +0000 (02:33 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values"
am:
a60e42cc2d
Change-Id: I38b27197171009958ed362a83a119b9de3af2adf
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:08 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:01 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973
Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460
Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
Cassie Han [Sat, 3 Mar 2018 00:15:26 +0000 (00:15 +0000)]
Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am:
d622eacb9e
am:
3bcb6da703
Change-Id: If07c5a8d84933e8a353a77b39a1aa76f4a51a5bf
nharold [Sat, 3 Mar 2018 00:11:29 +0000 (00:11 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values"
Pavel Maltsev [Sat, 3 Mar 2018 00:03:37 +0000 (00:03 +0000)]
Merge "Extend network request to query networks w/o capabilites" am:
d846adac83
am:
a3be78b5e7
Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7
Cassie Han [Fri, 2 Mar 2018 23:55:58 +0000 (23:55 +0000)]
Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"
am:
d622eacb9e
Change-Id: Ibe0c44df14dfa60855d513a85e76d8eef63d25a8
Pavel Maltsev [Fri, 2 Mar 2018 23:52:18 +0000 (23:52 +0000)]
Merge "Extend network request to query networks w/o capabilites"
am:
d846adac83
Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9
Holly Jiuyu Sun [Fri, 2 Mar 2018 23:51:17 +0000 (23:51 +0000)]
Merge "Add result code for eUICC card not found." am:
45277c7aca
am:
32c5a97aec
Change-Id: I43b81392646b3f2463a3df37eecbf4ffa7a653d0
Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:54 +0000 (23:39 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
Change-Id: Icea7f683d6428ed86d7446071fd85547127ee9dc
Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:48 +0000 (23:39 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Change-Id: Ic29200b8737f5718d33791faa5f7f12f3eeb9d76
Bill Yi [Fri, 2 Mar 2018 23:39:30 +0000 (15:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I823f9d64c30c157bd876f95c1f99ffddb0d88a4c
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 23:34:03 +0000 (23:34 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
Change-Id: I334a5d4006779caa60b3459cf73aca3b086b06e3
Android Build Merger (Role) [Fri, 2 Mar 2018 23:33:58 +0000 (23:33 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Change-Id: I2ce2dd84a3c87c575059a2f33f99dd7d6f43bef5
Bill Yi [Fri, 2 Mar 2018 23:33:37 +0000 (15:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: If394c2c84402b8d346f151b66e09337389425e47
Auto-generated-cl: translation import
Holly Jiuyu Sun [Fri, 2 Mar 2018 23:21:13 +0000 (23:21 +0000)]
Merge "Add result code for eUICC card not found."
am:
45277c7aca
Change-Id: Ib3ee5ff8cfcc18ac6a9e616e34ef778fe59b111c
Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:09 +0000 (23:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
Change-Id: I5115053a7f801215fea81c8f23bbb275aab0e0fd
Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:04 +0000 (23:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532
Change-Id: Id9175caf6dec27c84c1046d0f972ff82d56248a7
Bill Yi [Fri, 2 Mar 2018 23:01:39 +0000 (15:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icece121527012851ebbde0a78216acd34f7061aa
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:22 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
Change-Id: I3eabd9c7e638ba1b860759c07fb27360a91d8ab3
Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:15 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Change-Id: I6b298dd7d2c471c2ec860b0760b97fd06a360d81
Bill Yi [Fri, 2 Mar 2018 22:39:55 +0000 (14:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: If21d03f82c2a5eafaec39ecf54f05ed51fdacde6
Auto-generated-cl: translation import
Cassie Han [Fri, 2 Mar 2018 22:15:56 +0000 (22:15 +0000)]
Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"
Treehugger Robot [Fri, 2 Mar 2018 19:04:31 +0000 (19:04 +0000)]
Merge "Extend network request to query networks w/o capabilites"
Holly Jiuyu Sun [Fri, 2 Mar 2018 19:01:41 +0000 (19:01 +0000)]
Merge "Add result code for eUICC card not found."
Chalard Jean [Fri, 2 Mar 2018 13:17:23 +0000 (13:17 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am:
6001f72478
am:
e5e819f078
Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
Chalard Jean [Fri, 2 Mar 2018 13:10:45 +0000 (13:10 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
am:
6001f72478
Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
Chalard Jean [Fri, 2 Mar 2018 12:46:46 +0000 (12:46 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space" am:
20013384dc
am:
18e51821b1
Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871
Chalard Jean [Fri, 2 Mar 2018 12:34:25 +0000 (12:34 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
am:
20013384dc
Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da
Chalard Jean [Fri, 2 Mar 2018 11:52:15 +0000 (11:52 +0000)]
Merge "Give apps with NETWORK_SETTINGS right to see any VPN."
Chalard Jean [Fri, 2 Mar 2018 11:18:10 +0000 (11:18 +0000)]
Merge "Give VPNs the INTERNET capability when they route most of the IP space"
Chalard Jean [Wed, 21 Feb 2018 09:43:54 +0000 (18:43 +0900)]
Give apps with NETWORK_SETTINGS right to see any VPN.
...not only the ones that apply to them.
Bug:
73217368
Test: runtest frameworks-net and CTS
Change-Id: I436972a3e51e98bdd815771b451bcedadf684763
Chalard Jean [Mon, 26 Feb 2018 02:52:46 +0000 (11:52 +0900)]
Give VPNs the INTERNET capability when they route most of the IP space
Test: manual, plus wrote some new tests for this
Bug:
72765718
Change-Id: I9759da72b752fd8eeb1d0647db9ab341f04c0528
Nathan Harold [Wed, 28 Feb 2018 22:57:54 +0000 (14:57 -0800)]
Expose Carrier Name Override CarrierConfig Values
These CarrierConfig values are needed for a
CC app to override the SPN dynamically. Since
Carrier names are very complicated, it's extra
important that these values be exposed so that we
can properly enforce correct behavior through CTS.
Bug:
73734601
Test: compilation (no functional change)
Change-Id: I26dab1bd32d1d5273f707a37026cffca7fd639a3
Hall Liu [Fri, 2 Mar 2018 02:29:06 +0000 (02:29 +0000)]
Merge "Remove cell info from legacy apps without location on" am:
6b0e7370e2
am:
1c1b58432b
Change-Id: I0b6e2889788123f7b73de697098f44e324587477
Hall Liu [Fri, 2 Mar 2018 02:18:16 +0000 (02:18 +0000)]
Merge "Remove cell info from legacy apps without location on"
am:
6b0e7370e2
Change-Id: I6f0b5391b7a49232fc8bebd38047af0d77e333e1
Pavel Maltsev [Thu, 1 Feb 2018 19:16:02 +0000 (11:16 -0800)]
Extend network request to query networks w/o capabilites
Add another bit mask into NetworkCapabilities class that represents
unwanted capabilities and corresponding methods to add and remove them.
Bug:
72828388
Bug:
68762530
Test: runtest -x frameworks/base/tests/net/
Change-Id: Ie291167eb74fdb696c7ee145c8cc46ea8115d6ba
Hall Liu [Fri, 2 Mar 2018 00:49:33 +0000 (00:49 +0000)]
Merge "Remove cell info from legacy apps without location on"
Jack Yu [Thu, 1 Mar 2018 21:34:24 +0000 (21:34 +0000)]
Merge "Added indication update mode support" am:
03664c94ae
am:
3ab2a5bced
Change-Id: I82fc7c5e7b439dd202c48dddbb1e788612aa613c
Ajay Panicker [Thu, 1 Mar 2018 21:27:16 +0000 (21:27 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume" am:
2cd2a6aef0
am:
ad2f9017ad
Change-Id: I2526a89c6f366a77dbbeb0b3310438cbef2af857
Jack Yu [Thu, 1 Mar 2018 21:26:34 +0000 (21:26 +0000)]
Merge "Added indication update mode support"
am:
03664c94ae
Change-Id: I17685418cc44e78e3bdbd69d68591efe7d2922e5
Ajay Panicker [Thu, 1 Mar 2018 21:15:29 +0000 (21:15 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume"
am:
2cd2a6aef0
Change-Id: I133d1167c01d6f8433bdc63fba21f113e8098d8e
Holly Jiuyu Sun [Thu, 22 Feb 2018 22:58:44 +0000 (14:58 -0800)]
Add result code for eUICC card not found.
Bug:
38206971
Test: test on phone
Merged-In: Ia783fe68389d950b664ad312d98c7e3aa200b471
Change-Id: Ia783fe68389d950b664ad312d98c7e3aa200b471
Masaho Nishikawa [Mon, 18 Dec 2017 05:33:38 +0000 (14:33 +0900)]
Add config to show an alert dialog for video charges
Add config to show an alert dialog for video charges when user starts
a video call. The default value is false.
Test: manual - Verified that a warning dialog about charges when a
video call is started if KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL
is true.
Bug:
67832837
Test: manual
Change-Id: I11ab3ea9a8971a9d76b47714638f1fe0a9c980c2
Jack Yu [Thu, 1 Mar 2018 20:04:29 +0000 (20:04 +0000)]
Merge "Added indication update mode support"
Treehugger Robot [Thu, 1 Mar 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Bluetooth: Remove adjustAvrcpAbsoluteVolume"
Scott Main [Thu, 1 Mar 2018 19:21:50 +0000 (19:21 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev
am:
e3c0216f95
Change-Id: I535787ff921cb6e6978e57dd775e7446f67195f8
Ajay Panicker [Wed, 28 Feb 2018 19:36:07 +0000 (11:36 -0800)]
Bluetooth: Remove adjustAvrcpAbsoluteVolume
The AudioManager now handles all calculations for volume stepping now
and no longer uses adjustAvrcpAbsoluteVolume.
Bug:
68812037
Test: Compile
Change-Id: I9cbf7989e49738c7a43fe3142aced5803111271e
Scott Main [Thu, 1 Mar 2018 19:04:08 +0000 (19:04 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev
Scott Main [Tue, 19 Dec 2017 21:43:45 +0000 (13:43 -0800)]
Enable new yaml file for reference nav that lists all framework files.
This depends on DocLava changes in ag/
3382461
bug: b/
69845924
test: make ds-docs
Change-Id: I4acd2c2034581b349ab4c00cbfe195ee5eca2354
Jack Yu [Tue, 27 Feb 2018 23:15:14 +0000 (15:15 -0800)]
Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.
Test: Manual
Bug:
65112388
Merged-In: I4bb4894eaaba401f655e5dc25138275f5e8498e1
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
(cherry picked from commit
1a1c35750b2612e040c9392b4d0d6f4e1a2b3b8a)
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:43:31 +0000 (16:43 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit." am:
093c509c40
am:
031b91574d
Change-Id: I50385cb665a557baad8b271bcfd4431072db7592
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:37:13 +0000 (16:37 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
am:
093c509c40
Change-Id: I562562c1abc3a5a64820ca5eaa244f00a75c4200
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 15:11:14 +0000 (15:11 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
Anton Hansson [Thu, 1 Mar 2018 11:53:43 +0000 (11:53 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
c164c83191
am:
9ee9e6b2b6
Change-Id: I984b5ee633078401769d3c649aa9b020715772df
Anton Hansson [Thu, 1 Mar 2018 11:46:29 +0000 (11:46 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am:
c164c83191
Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 10:35:57 +0000 (10:35 +0000)]
Tweak DateFormat.is24HourFormat javadoc to be more explicit.
Bug:
32761394
Test: make docs
Change-Id: If10da5b9d63e6e88774e333d5c266e423e6bc7c8
Anton Hansson [Thu, 1 Mar 2018 10:25:12 +0000 (10:25 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
Chalard Jean [Thu, 1 Mar 2018 05:56:33 +0000 (05:56 +0000)]
Merge "Fix up NetworkCapabilities' toString" am:
7959e70ef2
am:
773523a667
Change-Id: I2f1578589232c49574dbf401d7f4becfa350a1c0
Chalard Jean [Thu, 1 Mar 2018 05:48:14 +0000 (05:48 +0000)]
Merge "Fix up NetworkCapabilities' toString"
am:
7959e70ef2
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
Eric Schwarzenbach [Thu, 1 Mar 2018 05:47:20 +0000 (05:47 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up." am:
44d13875ff
am:
c870528371
Change-Id: I2b57a55e8bb36ba24578c00e2afaebfc21e0e4c3
Eric Schwarzenbach [Thu, 1 Mar 2018 05:38:49 +0000 (05:38 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
am:
44d13875ff
Change-Id: I37f039ea44114b48b44bce7174deb3d55b2667fc
Chalard Jean [Thu, 1 Mar 2018 04:01:16 +0000 (04:01 +0000)]
Merge "Fix up NetworkCapabilities' toString"
Treehugger Robot [Thu, 1 Mar 2018 03:48:32 +0000 (03:48 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
Joe Maples [Thu, 1 Mar 2018 00:00:13 +0000 (00:00 +0000)]
Merge "pm: Fix typo in error" am:
a12e18bcd1
am:
a79fef132b
Change-Id: I45fa701a8f9e727e1a072f4f6dd773bba0de01aa
OSDN Git Service
