OSDN Git Service
Selim Cinek [Wed, 9 Nov 2016 23:19:19 +0000 (23:19 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
0294f9e39b
Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
Xin Li [Wed, 9 Nov 2016 21:26:57 +0000 (21:26 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f am:
0326b807fa am:
d478287ab9
am:
a29c7c77b1
Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15
Xin Li [Wed, 9 Nov 2016 21:25:42 +0000 (21:25 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520 am:
4c1922b441 am:
ba293f3c28
am:
a009932a57
Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795
Xin Li [Wed, 9 Nov 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f am:
0326b807fa
am:
d478287ab9
Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b
Xin Li [Wed, 9 Nov 2016 21:13:43 +0000 (21:13 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520 am:
4c1922b441
am:
ba293f3c28
Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2
Xin Li [Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f
am:
0326b807fa
Change-Id: I84618ae346458ff5db07a40aa6794900842bb222
Xin Li [Wed, 9 Nov 2016 21:02:08 +0000 (21:02 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520
am:
4c1922b441
Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d
Narayan Kamath [Wed, 9 Nov 2016 21:00:09 +0000 (21:00 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e am:
dac1d242ab
am:
2b3a352a4d
Change-Id: Ic07434a6485eb20682f439bf0997543b54e8db07
Narayan Kamath [Wed, 9 Nov 2016 20:58:59 +0000 (20:58 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours am:
30a6da2b14
am:
c8044be01e
Change-Id: Iab263d21c1d33b7c8c07bbb00db41705988f9632
Xin Li [Wed, 9 Nov 2016 20:57:56 +0000 (20:57 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac am:
781d8f7426 am:
c8ac64aca7
am:
b7f279051e
Change-Id: I0de48588205d46a800b4a945f364fab8e44e3f48
Xin Li [Wed, 9 Nov 2016 20:56:41 +0000 (20:56 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081 am:
9dccfbc7c8 am:
68d354abce
am:
3b4f8bc034
Change-Id: Ie39a05ce72f9d65ae6c5a76a6954a27966b7f667
Xin Li [Wed, 9 Nov 2016 20:52:19 +0000 (20:52 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69
am:
0bf282606f
Change-Id: I52dc31670838c2d067bf262981885f5bf2be3445
Xin Li [Wed, 9 Nov 2016 20:51:08 +0000 (20:51 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f
am:
892385f520
Change-Id: Icd01d06e42adc1995f555cc6e6bc146baee0fce1
Narayan Kamath [Wed, 9 Nov 2016 20:49:08 +0000 (20:49 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e
am:
dac1d242ab
Change-Id: If057ed9554180fd773113629ff32129f08d8eff3
Narayan Kamath [Wed, 9 Nov 2016 20:47:09 +0000 (20:47 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours
am:
30a6da2b14
Change-Id: I19477805ad4b8b5c66634dc33021461b17d99aca
Xin Li [Wed, 9 Nov 2016 20:46:08 +0000 (20:46 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac am:
781d8f7426
am:
c8ac64aca7
Change-Id: I8116a4a96c47bad2ff769fba878b863cc517c016
Xin Li [Wed, 9 Nov 2016 20:45:40 +0000 (20:45 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours
am:
4146229e69
Change-Id: I5530c638ccd5ad8af4115e6d8c5f85351948811d
Xin Li [Wed, 9 Nov 2016 20:45:14 +0000 (20:45 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081 am:
9dccfbc7c8
am:
68d354abce
Change-Id: I1c8d54f67f0e644e90856197a0713f7d6f86b33f
Xin Li [Wed, 9 Nov 2016 20:44:35 +0000 (20:44 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours
am:
d167a27c1f
Change-Id: I6301865f95712e610ab75031fe401386a8010efd
Narayan Kamath [Wed, 9 Nov 2016 20:41:16 +0000 (20:41 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa
am:
e3d31ebc0e
Change-Id: I27f374ed810a533e8df3111e1887e51520ebb3f1
Narayan Kamath [Wed, 9 Nov 2016 20:40:24 +0000 (20:40 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f
am:
76a388b93b -s ours
Change-Id: Ie2473f3fce3c956c9b6bc1ce9903d4c53874ddd4
Xin Li [Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058
am:
503661118a -s ours
Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
Xin Li [Wed, 9 Nov 2016 20:35:03 +0000 (20:35 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac
am:
781d8f7426
Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c
Xin Li [Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2
am:
84a9614947 -s ours
Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
Xin Li [Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081
am:
9dccfbc7c8
Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5
Narayan Kamath [Wed, 9 Nov 2016 20:26:18 +0000 (20:26 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf
am:
acdb6bb1aa
Change-Id: I363a163de6d9856ca84cc153ce3ef7a4485dc22e
Narayan Kamath [Wed, 9 Nov 2016 20:25:13 +0000 (20:25 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69
am:
4f65baa12f
Change-Id: Ib482d999552ca44ccc000a4a2f5604e920db2079
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e
am:
71e62a4058
Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630
am:
1a06ebfcac
Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00
Xin Li [Wed, 9 Nov 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours
am:
b9634f3081
Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446
Xin Li [Wed, 9 Nov 2016 20:23:01 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba
am:
63c9a312a2
Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
Xin Li [Wed, 9 Nov 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931
am:
eda0b0078e
Change-Id: Ibf745e727c36dd04b5cb30b574cca4b5709b9f4b
Xin Li [Wed, 9 Nov 2016 20:17:00 +0000 (20:17 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours
am:
6166af96ba
Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
Narayan Kamath [Wed, 9 Nov 2016 20:13:19 +0000 (20:13 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
am:
12f98789bf
Change-Id: Ib86b20a2e51cac443adc73d5c18bca73ac316613
Narayan Kamath [Wed, 9 Nov 2016 20:13:16 +0000 (20:13 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
25cd01cc69
Change-Id: I64dce88921b36a58dc66cd4b89e571ce9b8114eb
Xin Li [Wed, 9 Nov 2016 20:11:43 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
am:
49b144e630
Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
Xin Li [Wed, 9 Nov 2016 20:11:42 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
am:
cc115c5931
Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
Xin Li [Wed, 9 Nov 2016 20:11:38 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am:
9b9906e9c0 -s ours
Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
Xin Li [Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
am:
ee2903686f -s ours
Change-Id: I565953c9962f328055512615185de735c33a50bb
Sohani Rao [Wed, 9 Nov 2016 19:42:35 +0000 (19:42 +0000)]
Merge "Update REQUEST_PEERS message with calling package" am:
836e74052e am:
e8431a09ca
am:
dbacbe3fbe
Change-Id: Ia5df0103767d537f74f254cc12bd175f65787537
Sohani Rao [Wed, 9 Nov 2016 19:32:06 +0000 (19:32 +0000)]
Merge "Update REQUEST_PEERS message with calling package" am:
836e74052e
am:
e8431a09ca
Change-Id: If5f4f60919f2f4083f109e1609ecd1834030f1c8
Sohani Rao [Wed, 9 Nov 2016 19:26:51 +0000 (19:26 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
am:
836e74052e
Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
Damien Bargiacchi [Wed, 9 Nov 2016 19:22:29 +0000 (19:22 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am:
7da025f142
am:
bcbd1f8110
Change-Id: I6c85c5ff922eee94a2d61f7d4c92523d322d1881
Damien Bargiacchi [Wed, 9 Nov 2016 19:21:29 +0000 (19:21 +0000)]
Allow config.xml to set the default display's default color mode am:
4364bbf93f
am:
4e9436261f
Change-Id: Id468f9e353ae159df5cd730655fe7ce4a43696cf
Sohani Rao [Wed, 9 Nov 2016 19:15:43 +0000 (19:15 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
Damien Bargiacchi [Wed, 9 Nov 2016 19:14:33 +0000 (19:14 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev
am:
7da025f142
Change-Id: I52cf76707b3273aa92d566487189db2a593bedaa
Damien Bargiacchi [Wed, 9 Nov 2016 19:14:26 +0000 (19:14 +0000)]
Allow config.xml to set the default display's default color mode
am:
4364bbf93f
Change-Id: I6d68be94598f3fe28225826e00459d5707b7ecee
Damien Bargiacchi [Wed, 9 Nov 2016 19:05:34 +0000 (19:05 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev
Narayan Kamath [Wed, 9 Nov 2016 09:48:38 +0000 (09:48 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
Bill Yi [Wed, 9 Nov 2016 02:39:43 +0000 (02:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
aa13d0f09d -s ours
am:
497956cf15 -s ours
Change-Id: I75369b3d4c5dfa7ed1bb703c19a2e8c35251caf5
Bill Yi [Wed, 9 Nov 2016 02:38:47 +0000 (02:38 +0000)]
Import translations. DO NOT MERGE am:
95cd3f1976 -s ours
am:
f432618582 -s ours
Change-Id: I25f9d4fe5ffb60461bf087b4fcaf88f473850df6
Erik Kline [Wed, 9 Nov 2016 02:37:21 +0000 (02:37 +0000)]
Merge "Handle IpReachabilityMonitor errors better." into nyc-mr2-dev
am:
88424ed1b2
Change-Id: Ibd1a629182efc5b8e5db9fa6299496ff217df029
Erik Kline [Wed, 9 Nov 2016 02:37:17 +0000 (02:37 +0000)]
Handle IpReachabilityMonitor errors better.
am:
e452660466
Change-Id: I3bb9ce7caa99e166ddc576399453fcc9e172d6a6
Bill Yi [Wed, 9 Nov 2016 02:32:19 +0000 (02:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
aa13d0f09d -s ours
Change-Id: I8580ef0aca3b98579053a3eae475167b2037c3ed
Bill Yi [Wed, 9 Nov 2016 02:32:18 +0000 (02:32 +0000)]
Import translations. DO NOT MERGE
am:
95cd3f1976 -s ours
Change-Id: I1e881c254423133430aae108a87d349d49ba07d6
TreeHugger Robot [Wed, 9 Nov 2016 02:26:14 +0000 (02:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 9 Nov 2016 01:24:36 +0000 (17:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32363164
Change-Id: I8b2e02fa6ddcf65e7bd9f413e9d31022b60b57a5
Erik Kline [Wed, 9 Nov 2016 01:21:22 +0000 (01:21 +0000)]
Merge "Handle IpReachabilityMonitor errors better." into nyc-mr2-dev
Philip Cuadra [Tue, 8 Nov 2016 22:18:28 +0000 (22:18 +0000)]
Merge "Pinner Service - update Camera app max size to 80MB" into nyc-mr2-dev
am:
c2cbd3380b
Change-Id: I3dcbcafdb1cff59863c836a572347b7e88b3bbde
Philip Cuadra [Tue, 8 Nov 2016 22:18:17 +0000 (22:18 +0000)]
Pinner Service - update Camera app max size to 80MB
am:
ac39b9626d
Change-Id: I71ac0010c55b0362b878d294288779279a16cdf5
TreeHugger Robot [Tue, 8 Nov 2016 22:05:16 +0000 (22:05 +0000)]
Merge "Pinner Service - update Camera app max size to 80MB" into nyc-mr2-dev
Steven Moreland [Tue, 8 Nov 2016 21:36:10 +0000 (21:36 +0000)]
Merge "Update for namespaced services in hwservicemanager." am:
605df82c9e am:
3dcee9882d
am:
1a384933df
Change-Id: I3ab231d9342ec1100866d3da2d752c70793cdcd8
Steven Moreland [Tue, 8 Nov 2016 21:29:31 +0000 (21:29 +0000)]
Merge "Update for namespaced services in hwservicemanager." am:
605df82c9e
am:
3dcee9882d
Change-Id: I929f34098061e084f1d9a92070179351c65d5acc
Xin Li [Tue, 8 Nov 2016 21:25:38 +0000 (21:25 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
Xin Li [Tue, 8 Nov 2016 21:24:55 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
Steven Moreland [Tue, 8 Nov 2016 21:20:57 +0000 (21:20 +0000)]
Merge "Update for namespaced services in hwservicemanager."
am:
605df82c9e
Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
Treehugger Robot [Tue, 8 Nov 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Update for namespaced services in hwservicemanager."
Philip Cuadra [Wed, 2 Nov 2016 18:59:22 +0000 (11:59 -0700)]
Pinner Service - update Camera app max size to 80MB
The prebuilt camera app in /system/app uses uncompressed libs to save
memory. A recent update pushed it over the arbitrary 50MB limit. This
change moves that arbitrary limit to 80MB.
Bug
32289474
Tested manually
Change-Id: Icf4e4476447fd363f2ab311b237f17a0e9d43053
Manu Cornet [Tue, 8 Nov 2016 19:22:12 +0000 (19:22 +0000)]
Merge "DO NOT MERGE - Slightly better encapsulation for the set of recent activities" into nyc-mr2-dev
am:
c7f90bfb4f
Change-Id: I3b44e501627319d2c6b3c7e5c6807b7c151f2963
Manu Cornet [Tue, 8 Nov 2016 19:22:04 +0000 (19:22 +0000)]
DO NOT MERGE - Slightly better encapsulation for the set of recent activities
am:
6abecd2c2a
Change-Id: Iee98c0be053fbd8a83bb9a7c9cd464034ef86e56
Manu Cornet [Tue, 8 Nov 2016 19:13:02 +0000 (19:13 +0000)]
Merge "DO NOT MERGE - Slightly better encapsulation for the set of recent activities" into nyc-mr2-dev
Manu Cornet [Fri, 4 Nov 2016 17:13:13 +0000 (10:13 -0700)]
DO NOT MERGE - Slightly better encapsulation for the set of recent activities
Manual cherrypick from master since automated cherrypick had merge
conflicts.
Bug:
32101881
Test: Behavior is 100% covered by existing automated tests
Merged-In: Ibf2f5af268ec00abc8caa6232fb517b60545ad46
Change-Id: I04516c299ca00b2bfea731979af4aa918a056041
Sohani Rao [Mon, 19 Sep 2016 20:36:13 +0000 (13:36 -0700)]
Update REQUEST_PEERS message with calling package
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.
BUG:
30760540
Test: Unit tests, P2p scan to get peer list and
establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
Merged-In: Ia0eb466a370a00c0264944871ce348841a17abc3
Tyler Gunn [Tue, 8 Nov 2016 18:50:15 +0000 (18:50 +0000)]
Merge "Add voip audio mode configuration for ims call" am:
4296aa3b2b am:
06c65cc2a0
am:
a9dd430a6d
Change-Id: I2a5bf391568c11b2bada8d92c1fa264ed11551da
Tyler Gunn [Tue, 8 Nov 2016 18:43:52 +0000 (18:43 +0000)]
Merge "Add voip audio mode configuration for ims call" am:
4296aa3b2b
am:
06c65cc2a0
Change-Id: I0bcc55309ffd376a06dd8693a4d517695ae0240e
Tyler Gunn [Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)]
Merge "Add voip audio mode configuration for ims call"
am:
4296aa3b2b
Change-Id: I4b0cdaf7864f4db427b0c1736e51d09618f17b06
Tyler Gunn [Tue, 8 Nov 2016 18:27:50 +0000 (18:27 +0000)]
Merge "Add voip audio mode configuration for ims call"
Steven Moreland [Thu, 3 Nov 2016 22:17:04 +0000 (15:17 -0700)]
Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug:
31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
Bill Yi [Tue, 8 Nov 2016 12:16:42 +0000 (12:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
197da1f978 -s ours am:
5501036062 -s ours
am:
01c4a57a8d -s ours
Change-Id: I67f5883bf640d5176c74156e9b2d82390029d0a1
Bill Yi [Tue, 8 Nov 2016 12:15:29 +0000 (12:15 +0000)]
Import translations. DO NOT MERGE am:
7821bbd9a5 -s ours am:
82b5fa3fea -s ours
am:
ffc2bf7f28 -s ours
Change-Id: I46bd4478a75fc3a40028c35920b88475da753557
Bill Yi [Tue, 8 Nov 2016 12:14:26 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0a2dbc7a8f -s ours
am:
8c539aa606 -s ours
Change-Id: I7bf03812f395928d6e936dc25ac1a639d094ae8c
Bill Yi [Tue, 8 Nov 2016 12:13:22 +0000 (12:13 +0000)]
Import translations. DO NOT MERGE am:
aa451616c8 -s ours
am:
488ea0b715 -s ours
Change-Id: I659e61848ffdacf89249f58fa8776d64670e88f3
Bill Yi [Tue, 8 Nov 2016 12:08:40 +0000 (12:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
197da1f978 -s ours
am:
5501036062 -s ours
Change-Id: Idd14727a629fbd7eca5a1d81e7c56ad52053b2fb
Bill Yi [Tue, 8 Nov 2016 12:07:49 +0000 (12:07 +0000)]
Import translations. DO NOT MERGE am:
7821bbd9a5 -s ours
am:
82b5fa3fea -s ours
Change-Id: I8468dac311585e0b187bc15f782d23aa89e7c7b9
Bill Yi [Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
197da1f978 -s ours
Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae
Bill Yi [Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0a2dbc7a8f -s ours
Change-Id: I98c68abf6c4b81af8dc1a2bb31a7ba5c586673fb
Bill Yi [Tue, 8 Nov 2016 12:02:47 +0000 (12:02 +0000)]
Import translations. DO NOT MERGE
am:
aa451616c8 -s ours
Change-Id: Ife9391d34b07231b0e61435fb76050ee42afdad0
Bill Yi [Tue, 8 Nov 2016 12:02:47 +0000 (12:02 +0000)]
Import translations. DO NOT MERGE
am:
7821bbd9a5 -s ours
Change-Id: I026f6272bc57f0a16d87cb578668aeecea44c772
TreeHugger Robot [Tue, 8 Nov 2016 11:56:59 +0000 (11:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 8 Nov 2016 11:53:17 +0000 (11:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jimmy Wu [Wed, 2 Nov 2016 18:12:19 +0000 (02:12 +0800)]
Add voip audio mode configuration for ims call
Add config_use_voip_mode_for_ims key. Set to false if ims
audio routing is via modem; set to true if it is via rtp
stream.
Change-Id: I539d24d1d666b2d61a4a92d5b1e3fb762a2766dc
Bill Yi [Tue, 8 Nov 2016 10:03:00 +0000 (02:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1caa69921dbde7442c433f3373f17a442d1b48b3
Auto-generated-cl: translation import
Erik Kline [Fri, 14 Oct 2016 09:33:22 +0000 (18:33 +0900)]
Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().
Test: runtest frameworks-wifi
passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
which fails with an NPE for unrelated reasons.
Bug:
31038971
Bug:
31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
Bill Yi [Tue, 8 Nov 2016 04:59:23 +0000 (20:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
Michael Kwan [Tue, 8 Nov 2016 03:44:07 +0000 (03:44 +0000)]
Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev am:
4ad89bf51f
am:
bbc8d1d6ec
Change-Id: I3f188f652c776c1b64803b1b93b4f6062e7941fe
Michael Kwan [Tue, 8 Nov 2016 03:42:57 +0000 (03:42 +0000)]
Tweak AlertDialog and Preference layout for nonround watches. am:
6c8e3bb43d
am:
177fe7ec1d
Change-Id: I777c8626b900e6aa932516ed4b9d0ba16599f5ae
Michael Kwan [Tue, 8 Nov 2016 03:31:58 +0000 (03:31 +0000)]
Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
am:
4ad89bf51f
Change-Id: I3024ca375ebf077cba52696da7ac549bf0eff781
Michael Kwan [Tue, 8 Nov 2016 03:31:55 +0000 (03:31 +0000)]
Tweak AlertDialog and Preference layout for nonround watches.
am:
6c8e3bb43d
Change-Id: I8403f321396198d1c8b481c920c52448f2c024d0
TreeHugger Robot [Tue, 8 Nov 2016 03:21:10 +0000 (03:21 +0000)]
Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
Jeff Sharkey [Tue, 8 Nov 2016 01:21:47 +0000 (01:21 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8 am:
a61e5fb9f6 am:
e9cd3aea19 am:
557389d96b am:
bd314fa444
am:
1563f499a1
Change-Id: I4e69a65b1f6e8178fa970f2dee53520a3751dca1
OSDN Git Service
