OSDN Git Service
Baligh Uddin [Thu, 5 Nov 2015 20:01:03 +0000 (20:01 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Baligh Uddin [Thu, 5 Nov 2015 20:00:34 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8019f49d08 -s ours
* commit '
8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:59:19 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8019f49d08 -s ours
* commit '
8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 19:56:57 +0000 (19:56 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am:
c74dd7fcb1
* commit '
c74dd7fcb128e9a1465c1a91a91a851c3386a955':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:55:32 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
e1348a7fa9 -s ours
* commit '
e1348a7fa983099ccc387ee41ae1056571f33f51':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:54:07 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
2523c61fb7 -s ours
* commit '
2523c61fb78e9f6022b9762750842a65bcb224f3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:53:11 +0000 (19:53 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Baligh Uddin [Thu, 5 Nov 2015 19:52:40 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
cfd3d76b91 -s ours
* commit '
cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:51:44 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
cfd3d76b91 -s ours
* commit '
cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:50:16 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c138df954f -s ours
* commit '
c138df954f4ace40e722b9acbb2359d566da2147':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:48:50 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
aa4dbe2d84 -s ours
* commit '
aa4dbe2d84e4b92843496586ce70ba0eacaf51ae':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
70df552ac2 -s ours
* commit '
70df552ac2a2154bae5f1420bfd8bbaa4dc08811':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
31f0d18a03 -s ours
* commit '
31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 19:41:33 +0000 (19:41 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:40:59 +0000 (19:40 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
am:
22b7e496c2
* commit '
22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
Use std::unique_ptr instead of UniquePtr.
Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:20 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:16 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:12 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Chad Brubaker [Thu, 5 Nov 2015 18:58:39 +0000 (18:58 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720
am:
0bafbbfcb4
* commit '
0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Brian Carlstrom [Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518
am:
671d5965f7
* commit '
671d5965f7b15ecba10453e8f445418dc0e730e6':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:28:19 +0000 (18:28 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6
am:
a41288b88f
* commit '
a41288b88f18273a61ed0af977408761598216cf':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Deepanshu Gupta [Thu, 5 Nov 2015 17:24:38 +0000 (17:24 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
am:
71093465ab
* commit '
71093465abbdf887c705b40fb0cb8a2919894c4b':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:21:16 +0000 (17:21 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
Deepanshu Gupta [Thu, 5 Nov 2015 01:49:16 +0000 (17:49 -0800)]
Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Svetoslav Ganov [Thu, 5 Nov 2015 02:30:08 +0000 (02:30 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c
am:
0c7e9262a1
* commit '
0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:28:40 +0000 (02:28 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2
am:
a9b62e1330
* commit '
a9b62e13305d9cb43f53831f0b92d72bd490c1ae':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
Baligh Uddin [Wed, 4 Nov 2015 23:59:57 +0000 (15:59 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
Baligh Uddin [Wed, 4 Nov 2015 23:36:55 +0000 (15:36 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
Baligh Uddin [Wed, 4 Nov 2015 23:34:55 +0000 (15:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
Baligh Uddin [Wed, 4 Nov 2015 23:32:37 +0000 (15:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
Baligh Uddin [Wed, 4 Nov 2015 23:30:29 +0000 (15:30 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
Baligh Uddin [Wed, 4 Nov 2015 23:28:25 +0000 (15:28 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
Baligh Uddin [Wed, 4 Nov 2015 23:26:15 +0000 (15:26 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
Baligh Uddin [Wed, 4 Nov 2015 23:24:05 +0000 (15:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I31e759c6b0da2ecb71418aa3033f832a9ee42250
Chad Brubaker [Fri, 23 Oct 2015 22:33:56 +0000 (15:33 -0700)]
Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.
This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
certificate pinning.
* Policy on what to do with cleartext traffic.
In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.
This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.
Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
Riley Andrews [Wed, 4 Nov 2015 20:37:18 +0000 (20:37 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d am:
2c740f1dcf
am:
6c1144dc0f
* commit '
6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:30:48 +0000 (20:30 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d
am:
2c740f1dcf
* commit '
2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:24:36 +0000 (20:24 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am:
c8bb39d98d
* commit '
c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
Baligh Uddin [Wed, 4 Nov 2015 19:56:04 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
Baligh Uddin [Wed, 4 Nov 2015 19:51:55 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
Chris Craik [Wed, 4 Nov 2015 19:46:47 +0000 (19:46 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b am:
8b581e2bc7
am:
a853bb450c
* commit '
a853bb450ce7e6f06220a86dcc171a837d30511b':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8 am:
62b16e2e10
am:
1938c39f77
* commit '
1938c39f77a52c1058e7b2434bdc5d08ed9053b9':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:40:02 +0000 (19:40 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b
am:
8b581e2bc7
* commit '
8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
am:
10eb6ab94b
* commit '
10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8
am:
62b16e2e10
* commit '
62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:28:39 +0000 (19:28 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:27:19 +0000 (19:27 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
am:
c4aaf0f4b8
* commit '
c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:20:52 +0000 (19:20 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.
b/
24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit
8d0ec389531d071529fb0a800f10733b057205d9)
Geoff Mendal [Wed, 4 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours
am:
c5b905f500 -s ours
* commit '
c5b905f50069233c2769352a0614605b3ad348f8':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:22:58 +0000 (18:22 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am:
e22d81debd
* commit '
e22d81debd8f2ac9432f42e4c1908da4400a1a29':
John Reck [Wed, 4 Nov 2015 18:21:35 +0000 (18:21 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04
am:
26f50df754
* commit '
26f50df75477a18e40c6da59a15cc2bd4b441239':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:19:40 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours am:
d4d6fdefdf -s ours
am:
7c941cd30c -s ours
* commit '
7c941cd30c9c958c4776126f9f16b343f1f10ff3':
Import translations. DO NOT MERGE
Chris Craik [Wed, 4 Nov 2015 18:12:28 +0000 (10:12 -0800)]
Remove -ffast-math from libhwui makefile
bug:
25417885
Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
Geoff Mendal [Wed, 4 Nov 2015 18:12:19 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours
am:
cbe037b01a -s ours
* commit '
cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:11:21 +0000 (18:11 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
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"
John Reck [Wed, 4 Nov 2015 18:09:49 +0000 (18:09 +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
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8e7ab07ce7 -s ours
* commit '
8e7ab07ce76c20da653e098adfe38da867753305':
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
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
Glenn Kasten [Wed, 4 Nov 2015 16:19:36 +0000 (16:19 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82
am:
1104180301
* commit '
110418030167702f29fa686616d68fc62f9c0995':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
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:35:39 +0000 (14:35 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am:
1c442aca0a
* commit '
1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
Remove auto-boxing during the inflate
Diego Perez [Wed, 4 Nov 2015 14:34:19 +0000 (14:34 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am:
7dda46e740
* commit '
7dda46e740250d753bb9d01e129e91695ab8cfe2':
Update StaticLayout_Delegate to use new nLoadHyphenator
Geoff Mendal [Wed, 4 Nov 2015 14:27:19 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours
am:
b67481b336 -s ours
* commit '
b67481b336d211c6d96e2110e865b55f615fd9df':
Import translations. DO NOT MERGE
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:25:55 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours
am:
5bf5deb84c -s ours
* commit '
5bf5deb84cdc61aa27ea12695ee20cc308e45184':
Import translations. DO NOT MERGE
OSDN Git Service
