OSDN Git Service
John Reck [Wed, 4 Nov 2015 18:10:52 +0000 (18:10 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:08:13 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours
am:
d4d6fdefdf -s ours
* commit '
d4d6fdefdf83018e46e8de56f0e1679954bb398a':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am:
1e1fbd804b
* commit '
1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am:
4c9cdbc7ba -s ours
* commit '
4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"
Bug
25462107
This reverts commit
d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Geoff Mendal [Wed, 4 Nov 2015 14:09:51 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
931082b728 -s ours
* commit '
931082b728a42e0b22b163721d7d48faf23d45a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:08:19 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE
am:
f44adbba69 -s ours
* commit '
f44adbba69c22e4c9cd681bbb3cab70097eae118':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:09:10 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 11:35:34 +0000 (11:35 +0000)]
Update StaticLayout_Delegate to use new nLoadHyphenator
Small fix to update call parameters
Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
Daniel Koulomzin [Wed, 4 Nov 2015 00:02:32 +0000 (00:02 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours
am:
6e0a83bcd9
* commit '
6e0a83bcd97574451e83d58ac646af9daf3216be':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Tue, 3 Nov 2015 23:51:39 +0000 (23:51 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE
am:
7e19e286cc -s ours
* commit '
7e19e286cc990daaafe934ed82ddfa00762907d6':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool. DO NOT MERGE
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Ian Pedowitz [Tue, 3 Nov 2015 22:13:54 +0000 (22:13 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6
am:
95fc53b029
* commit '
95fc53b0293a6361c7ff8a412897a869f07664c6':
Limit persistent ashmem backed fds to a minimum of 128kB.
Ian Pedowitz [Tue, 3 Nov 2015 22:05:23 +0000 (22:05 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am:
966d6040c6
* commit '
966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
Ian Pedowitz [Tue, 3 Nov 2015 21:58:30 +0000 (21:58 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Tenghui Zhu [Tue, 3 Nov 2015 19:49:20 +0000 (19:49 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am:
61c93eb16d
am:
a66dc6e159
* commit '
a66dc6e159bd8f4997a9253d5590807c02358d84':
Use clang for libhwui
Tenghui Zhu [Tue, 3 Nov 2015 19:40:29 +0000 (19:40 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
am:
61c93eb16d
* commit '
61c93eb16d91bd210948af6e812517e3c03535b4':
Use clang for libhwui
Tenghui Zhu [Tue, 3 Nov 2015 19:25:43 +0000 (19:25 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
Ching Tzung Lin [Tue, 3 Nov 2015 19:03:48 +0000 (19:03 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am:
7f54aa1e81
* commit '
7f54aa1e814527371d54864bcbf9387553822ea7':
Remove circular_display_mask_offset symbol and default
Ching Tzung Lin [Tue, 3 Nov 2015 18:39:40 +0000 (18:39 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui
bug:
25417885
Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
Dianne Hackborn [Tue, 3 Nov 2015 18:33:57 +0000 (18:33 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am:
71e4984505
am:
9a13cc6992
* commit '
9a13cc69926c90fe75b624a9a781dc56706a6091':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:27:18 +0000 (18:27 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am:
71e4984505
* commit '
71e49845054a3a7dacc51efc4fe658818caec048':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:21:23 +0000 (18:21 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
Riley Andrews [Mon, 2 Nov 2015 07:36:04 +0000 (23:36 -0800)]
Limit persistent ashmem backed fds to a minimum of 128kB.
Bug
25256717
Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
Diego Perez [Tue, 3 Nov 2015 14:59:23 +0000 (14:59 +0000)]
Remove auto-boxing during the inflate
Change-Id: I3f9ba5d78363f878fa0c58ca8cbf736bd43fe1c0
Thierry Strudel [Tue, 3 Nov 2015 06:45:12 +0000 (06:45 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e
am:
b1fe11fde4
* commit '
b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:39:58 +0000 (06:39 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am:
1942be506e
* commit '
1942be506eb16589e3059fa62ea7b718440fb386':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
Tyler Gunn [Tue, 3 Nov 2015 04:54:47 +0000 (04:54 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296
am:
48a0c3ae8d
* commit '
48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:49:33 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am:
8b86c76296
* commit '
8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Sanket Padawe [Tue, 3 Nov 2015 01:58:05 +0000 (01:58 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am:
b57c65b00e
am:
71f018a411
* commit '
71f018a411c55383f395adc52d8363d6103529d3':
Fix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Tue, 3 Nov 2015 01:52:13 +0000 (01:52 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am:
b57c65b00e
* commit '
b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
Fix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Tue, 3 Nov 2015 01:47:04 +0000 (01:47 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
Selim Cinek [Tue, 3 Nov 2015 01:29:27 +0000 (01:29 +0000)]
Fixed a bug where the panel could get stuck closing am:
b0e4f9e97e
am:
157e60f7a2
* commit '
157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e':
Fixed a bug where the panel could get stuck closing
Selim Cinek [Tue, 3 Nov 2015 01:21:43 +0000 (01:21 +0000)]
Fixed a bug where the panel could get stuck closing
am:
b0e4f9e97e
* commit '
b0e4f9e97e272783f08b2245219239aaa667073d':
Fixed a bug where the panel could get stuck closing
Dianne Hackborn [Mon, 2 Nov 2015 21:43:29 +0000 (13:43 -0800)]
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again. So usage stats could start
thinking they are idle.
Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.
Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.
Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a
Sanket Padawe [Mon, 2 Nov 2015 23:45:18 +0000 (15:45 -0800)]
Fix a crash while printing ICCID because of alphabets in UICC.
Bug:
25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573
Selim Cinek [Mon, 2 Nov 2015 21:42:58 +0000 (13:42 -0800)]
Fixed a bug where the panel could get stuck closing
When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.
Bug:
25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae
Ching Tzung Lin [Mon, 2 Nov 2015 21:39:51 +0000 (13:39 -0800)]
Remove circular_display_mask_offset symbol and default
Bug:
25220421
Change-Id: I05c3bc3c54ee4aaefdfbb4963b8f656663ccee51
Svetoslav Ganov [Mon, 2 Nov 2015 21:10:49 +0000 (21:10 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am:
a47f9dad2b
am:
c4c1866228
* commit '
c4c1866228a776758d71cf4d171a17fa01891d89':
Don't try overriding system fixed permissions on install
Svetoslav Ganov [Mon, 2 Nov 2015 21:04:25 +0000 (21:04 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev
am:
a47f9dad2b
* commit '
a47f9dad2bd70b594e445a6a448877122f28517a':
Don't try overriding system fixed permissions on install
Svetoslav Ganov [Mon, 2 Nov 2015 20:57:12 +0000 (20:57 +0000)]
Merge "Don't try overriding system fixed permissions on install" into mnc-dr-dev
Svetoslav Ganov [Mon, 2 Nov 2015 19:45:17 +0000 (19:45 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev am:
cfa233eefb
am:
22d7f4c2ed
* commit '
22d7f4c2eddef09e0ceb16aadff2860a184a68d8':
Allow verifier to grant permissions
Svet Ganov [Mon, 2 Nov 2015 17:32:01 +0000 (09:32 -0800)]
Don't try overriding system fixed permissions on install
bug:
25397466
Change-Id: Ie92ec000a94b757178ddfdd9384407535f4af9db
Svetoslav Ganov [Mon, 2 Nov 2015 19:38:22 +0000 (19:38 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev
am:
cfa233eefb
* commit '
cfa233eefb5b77c96a3239a5a51f381a7f0722c9':
Allow verifier to grant permissions
Svetoslav Ganov [Mon, 2 Nov 2015 19:33:44 +0000 (19:33 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev
Tyler Gunn [Mon, 2 Nov 2015 19:24:57 +0000 (11:24 -0800)]
Improve comment on EXTRA_CALL_RAT_TYPE.
Adding comments to EXTRA_CALL_RAT_TYPE to make it clear what it is used
for, and what values are expected.
Bug:
20144385
Change-Id: I248aca61abc8a57d7aeef650e48cc498e41c859b
Jeff Sharkey [Mon, 2 Nov 2015 17:58:35 +0000 (17:58 +0000)]
PackageSettingBase needs to copy volume UUID. am:
3b1c6e03f6
am:
e63509b509
* commit '
e63509b5093776e0320876719226cbbb16cc5eab':
PackageSettingBase needs to copy volume UUID.
Jeff Sharkey [Mon, 2 Nov 2015 17:51:53 +0000 (17:51 +0000)]
PackageSettingBase needs to copy volume UUID.
am:
3b1c6e03f6
* commit '
3b1c6e03f67ba8e4a4f4a98e996c7ceabf36affa':
PackageSettingBase needs to copy volume UUID.
Jeff Sharkey [Sat, 31 Oct 2015 20:58:54 +0000 (13:58 -0700)]
PackageSettingBase needs to copy volume UUID.
When copying all fields from one PackageSettingBase to another, we
also need to copy volumeUuid, which had previously been missed.
Without this, packages using sharedUserId that are installed on
adopted storage devices will be destroyed, since after reboot we
think they actually belong on internal storage (where volumeUuid is
null).
Bug:
25334169
Change-Id: I223361bd1e19e7d5dd78626682ac7c5cbecb9fa1
Jeff Sharkey [Fri, 30 Oct 2015 21:49:44 +0000 (21:49 +0000)]
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am:
a975732a83
am:
637d05eb5c
* commit '
637d05eb5c19825b1f9a7da481037a0c54add08d':
Handle "uninstalled" apps when pruning app-ops.
Jeff Sharkey [Fri, 30 Oct 2015 21:37:17 +0000 (21:37 +0000)]
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
am:
a975732a83
* commit '
a975732a8302893a40cdc444f893bf09b7669173':
Handle "uninstalled" apps when pruning app-ops.
Jeff Sharkey [Fri, 30 Oct 2015 21:32:28 +0000 (21:32 +0000)]
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
Anthony Hugh [Fri, 30 Oct 2015 20:11:54 +0000 (20:11 +0000)]
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
am:
3a9bf5c8ce
* commit '
3a9bf5c8ceca8783d169faffdc70a6ea88d609bf':
Add intent extra for determining if apps are system apps
Anthony Hugh [Fri, 30 Oct 2015 20:04:10 +0000 (20:04 +0000)]
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:33:34 +0000 (14:33 +0000)]
Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am:
4ec415800f
am:
b5ab0ec3c0
* commit '
b5ab0ec3c05f88c1305d962fffcd185ab5c6a8e9':
IMS: Support For Per-Call RAT Info
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:26:51 +0000 (14:26 +0000)]
Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
am:
4ec415800f
* commit '
4ec415800fd55d2bb128d7635f8b984145dbe983':
IMS: Support For Per-Call RAT Info
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:22:28 +0000 (14:22 +0000)]
Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
Jeff Sharkey [Fri, 30 Oct 2015 02:00:44 +0000 (19:00 -0700)]
Handle "uninstalled" apps when pruning app-ops.
During system boot, we prune app-ops belonging to apps that have
been uninstalled. However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.
To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.
Bug:
25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
Omkar Kolangade [Thu, 29 Oct 2015 22:06:27 +0000 (15:06 -0700)]
IMS: Support For Per-Call RAT Info
Adding the extra key that will be used to
propagate RAT information for each call via
call extras. The key is used in IMS Service.
Bug:
20144385
Change-Id: Ia7ca81d661afb579fd25315036c43489b1dca50d
Thierry Strudel [Thu, 29 Oct 2015 21:40:29 +0000 (14:40 -0700)]
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Bug:
24986869
Change-Id: Iab4e5ce6be0b5279ce85f868037ba256ee62c0ac
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Svetoslav [Fri, 30 Oct 2015 00:00:06 +0000 (17:00 -0700)]
Allow verifier to grant permissions
bug:
25329324
Change-Id: I2ac01a983ad812df7725a0499a8d9b470a7ea481
Carlos Valdivia [Fri, 30 Oct 2015 00:01:19 +0000 (00:01 +0000)]
Get rid of getTypesVisibleToCaller log spam. am:
02bffab9dc
am:
1fd46d1581
* commit '
1fd46d158151dad15d71a5ff857f6f7abc565dcb':
Get rid of getTypesVisibleToCaller log spam.
Carlos Valdivia [Thu, 29 Oct 2015 23:51:51 +0000 (23:51 +0000)]
Get rid of getTypesVisibleToCaller log spam.
am:
02bffab9dc
* commit '
02bffab9dc6cc50dd0efdb4bff4feaa9672de5ea':
Get rid of getTypesVisibleToCaller log spam.
Carlos Valdivia [Thu, 29 Oct 2015 23:41:21 +0000 (16:41 -0700)]
Get rid of getTypesVisibleToCaller log spam.
Bug:
25062620
Change-Id: Ia3080c501a288522a5b1de88d50f365357418ba8
Nick Kralevich [Thu, 29 Oct 2015 21:38:41 +0000 (21:38 +0000)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch am:
5701321701
am:
aa330c0dc2
* commit '
aa330c0dc2331f099ce05ecd76d56b8c9e9c483d':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Nick Kralevich [Thu, 29 Oct 2015 21:30:59 +0000 (21:30 +0000)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
am:
5701321701
* commit '
5701321701a319d3f2d98365a82266eeddaed895':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Nick Kralevich [Thu, 29 Oct 2015 19:45:23 +0000 (12:45 -0700)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Make sure access to MTP data is relocked when a user switch occurs.
Bug:
25288494
Change-Id: I69dafc7f51b847f4dba1993a85fb1a51df1a5e37
Geoff Mendal [Thu, 29 Oct 2015 19:49:05 +0000 (19:49 +0000)]
Import translations. DO NOT MERGE am:
c3cd7b1585 -s ours
am:
57e5d5836c -s ours
* commit '
57e5d5836c808de85b460af186d1553709a337d4':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 29 Oct 2015 19:38:38 +0000 (19:38 +0000)]
Import translations. DO NOT MERGE
am:
c3cd7b1585 -s ours
* commit '
c3cd7b1585e7ca2b3b1c9ea2ea7a9971c4b0be01':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 29 Oct 2015 19:27:09 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25319151
Change-Id: I4170f31d992d23a365c98fe5e799a31ef48f17bd
Geoff Mendal [Thu, 29 Oct 2015 19:21:22 +0000 (19:21 +0000)]
Import translations. DO NOT MERGE
am:
05738e33ca -s ours
* commit '
05738e33ca730100e4825d280c00ab9201178e04':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 29 Oct 2015 19:14:06 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25319151
Change-Id: Ie6489b1bcab3dc453d04a200028d407dab17c8fa
Lorenzo Colitti [Thu, 29 Oct 2015 08:09:27 +0000 (08:09 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am:
a2cc04736d
am:
e4aacaeec9
* commit '
e4aacaeec950691700d717efa894a7b51bc87fe2':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 08:02:31 +0000 (08:02 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am:
a2cc04736d
* commit '
a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 07:57:13 +0000 (07:57 +0000)]
Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev
Bryce Lee [Thu, 29 Oct 2015 07:16:07 +0000 (07:16 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
am:
4636770f0d
* commit '
4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bryce Lee [Thu, 29 Oct 2015 07:10:15 +0000 (07:10 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]
Don't crash if a DHCP server doesn't send the server ID option.
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.
Bug:
25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
Bryce Lee [Thu, 29 Oct 2015 05:21:54 +0000 (22:21 -0700)]
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bug:
25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
Bryce Lee [Thu, 29 Oct 2015 05:10:41 +0000 (05:10 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
am:
0a80294c81
* commit '
0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."
Bryce Lee [Thu, 29 Oct 2015 05:04:06 +0000 (05:04 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:58:38 +0000 (04:58 +0000)]
Revert "Declare new interface for headset client bluetooth profile to query."
This reverts commit
694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
Bryce Lee [Thu, 29 Oct 2015 04:45:09 +0000 (04:45 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am:
a841973dee
* commit '
a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.
Bryce Lee [Thu, 29 Oct 2015 04:39:08 +0000 (04:39 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:06:27 +0000 (21:06 -0700)]
Declare new interface for headset client bluetooth profile to query.
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug:
25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
Svetoslav Ganov [Thu, 29 Oct 2015 01:24:38 +0000 (01:24 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am:
2658cb002a
am:
35151fbc8b
* commit '
35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:16:46 +0000 (01:16 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am:
2658cb002a
* commit '
2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
Anthony Hugh [Wed, 28 Oct 2015 18:29:06 +0000 (18:29 +0000)]
Merge "Update permission label strings" into cw-e-dev
am:
b69cab65d1
* commit '
b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings
Anthony Hugh [Wed, 28 Oct 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Update permission label strings" into cw-e-dev
Ching Tzung Lin [Wed, 28 Oct 2015 17:33:03 +0000 (17:33 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am:
36da2a208e
* commit '
36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset