OSDN Git Service
Bryce Lee [Tue, 1 Dec 2015 15:57:07 +0000 (15:57 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am:
085796bdf5 -s ours am:
4ecf963e77 -s ours
am:
8f95fe4b71 -s ours
* commit '
8f95fe4b71b54ee920d71b6b689b0e7f53994f00':
DO NOT MERGE ANYWHERE
Bryce Lee [Tue, 1 Dec 2015 15:50:14 +0000 (15:50 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am:
085796bdf5 -s ours
am:
4ecf963e77 -s ours
* commit '
4ecf963e770e0226c3fcef509ff5d7fb6c31ed0b':
DO NOT MERGE ANYWHERE
Bryce Lee [Tue, 1 Dec 2015 15:43:15 +0000 (15:43 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
am:
085796bdf5 -s ours
* commit '
085796bdf5e106abd42db2d0ef7d3aee899a766b':
DO NOT MERGE ANYWHERE
Bryce Lee [Tue, 1 Dec 2015 15:37:30 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
Bryce Lee [Mon, 30 Nov 2015 19:09:17 +0000 (19:09 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583 am:
b241487c16
am:
64e41590d2
* commit '
64e41590d246cf1fc548b72d40436bcd2fca7b06':
Add callback for connections to be notified when the ringer is silenced.
Bryce Lee [Mon, 30 Nov 2015 19:02:38 +0000 (19:02 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583
am:
b241487c16
* commit '
b241487c16976a3f0aa6592740bba15f489eab17':
Add callback for connections to be notified when the ringer is silenced.
Bryce Lee [Mon, 30 Nov 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
am:
52bdf11583
* commit '
52bdf11583366322ca14d69b895ac451a71245db':
Add callback for connections to be notified when the ringer is silenced.
Bryce Lee [Mon, 30 Nov 2015 18:51:39 +0000 (18:51 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
Erik Wolsheimer [Mon, 30 Nov 2015 17:35:20 +0000 (17:35 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd am:
1dbb0355dc
am:
1d92c4538f
* commit '
1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:28:44 +0000 (17:28 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd
am:
1dbb0355dc
* commit '
1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:22:56 +0000 (17:22 +0000)]
fix data race condition BUG:
25819358
am:
2242b4d2bd
* commit '
2242b4d2bda7f83cf7813103ff95d9b4e244126f':
fix data race condition BUG:
25819358
Chad Brubaker [Sun, 29 Nov 2015 23:56:01 +0000 (23:56 +0000)]
Merge "Remove isCertificateEntry check" am:
7d72975c5b
am:
59919babe0
* commit '
59919babe0763980ae0a3977e2701ad2d81a6cbe':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:50:33 +0000 (23:50 +0000)]
Merge "Remove isCertificateEntry check"
am:
7d72975c5b
* commit '
7d72975c5b3e6f18710f078199e7a9e3f9376c60':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:45:47 +0000 (23:45 +0000)]
Merge "Remove isCertificateEntry check"
Chad Brubaker [Thu, 26 Nov 2015 22:00:50 +0000 (14:00 -0800)]
Remove isCertificateEntry check
This was returning false on some test keystores even when
getCertificate would correct return a certificate. Remove the check to
be consistent with how conscrypt loads trust anchors from the keystore.
Bug:
25897324
Change-Id: Ie87658a261ee7ba1cca6896e34b6c53b8abfba85
Chad Brubaker [Wed, 25 Nov 2015 20:48:25 +0000 (20:48 +0000)]
Merge "Implement checkClientTrusted" am:
8e19803a6a
am:
a4a6cf9b51
* commit '
a4a6cf9b51e903087e2c7f77f2dcb814a0b43fb8':
Implement checkClientTrusted
Chad Brubaker [Wed, 25 Nov 2015 20:41:03 +0000 (20:41 +0000)]
Merge "Implement checkClientTrusted"
am:
8e19803a6a
* commit '
8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8':
Implement checkClientTrusted
Chad Brubaker [Wed, 25 Nov 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Implement checkClientTrusted"
Chad Brubaker [Wed, 25 Nov 2015 18:39:28 +0000 (10:39 -0800)]
Implement checkClientTrusted
Bug:
25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
Alex Klyubin [Wed, 25 Nov 2015 19:13:21 +0000 (19:13 +0000)]
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am:
e766e399c5
am:
4bc1904119
* commit '
4bc1904119875dd0e8c63f87106e8ab293cc9a7a':
Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
Alex Klyubin [Wed, 25 Nov 2015 19:05:09 +0000 (19:05 +0000)]
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
am:
e766e399c5
* commit '
e766e399c59669156284c330ae3f38f79230d930':
Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
Alex Klyubin [Wed, 25 Nov 2015 18:59:35 +0000 (18:59 +0000)]
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
Alex Klyubin [Wed, 25 Nov 2015 01:22:27 +0000 (17:22 -0800)]
Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
This makes Android Keystore's Cipher implementation use a custom
implementation of engineUpdate(ByteBuffer, ByteBuffer) and
engineDoFinal(ByteBuffer, ByteBuffer). The implementation is
explicitly designed around the fact that Android Keystore transmits
input and receives output via Binder and thus there's no need to
attempt any optimizations to avoid copying input and output.
Bug:
25863382
Change-Id: I311072891f02f5e7a283628b51b8d6058b55231c
Erik Wolsheimer [Tue, 24 Nov 2015 21:22:04 +0000 (13:22 -0800)]
fix data race condition
BUG:
25819358
Change-Id: I9d9978c92d084e93ccb41ea1d0fe33ffe3e17e3d
Jim Kaye [Tue, 24 Nov 2015 19:42:14 +0000 (19:42 +0000)]
Merge "Extend the \'qwerty\' key layout" am:
9a83f115ad
am:
e579edc76b
* commit '
e579edc76b6f3f8c977d96db6af01d73e6c93804':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:33:57 +0000 (19:33 +0000)]
Merge "Extend the \'qwerty\' key layout"
am:
9a83f115ad
* commit '
9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:27:46 +0000 (19:27 +0000)]
Merge "Extend the 'qwerty' key layout"
Sergio Giro [Tue, 24 Nov 2015 15:51:13 +0000 (15:51 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am:
d5a5d547d0
am:
d9942006e4
* commit '
d9942006e4a45884fffda8e5888d9657f40b48d2':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 15:43:06 +0000 (15:43 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am:
d5a5d547d0
* commit '
d5a5d547d05eee9d626db1d7977c11acbf83b0c7':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
Kevin Neas [Tue, 24 Nov 2015 02:54:07 +0000 (02:54 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am:
4dbb586585 am:
b6ae32162e
am:
32a7d85f64
* commit '
32a7d85f64a193745de81ee94b7b4d7adefb3f02':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 02:46:24 +0000 (02:46 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am:
4dbb586585
am:
b6ae32162e
* commit '
b6ae32162e77d9f11620b6806dec20a0987e2dab':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 01:58:00 +0000 (01:58 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
am:
4dbb586585
* commit '
4dbb58658552d1cdae46ef06d331b867f5610786':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 00:50:18 +0000 (00:50 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
Jim Kaye [Mon, 23 Nov 2015 20:22:59 +0000 (12:22 -0800)]
Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.
These are needed to support Emulator UI
buttons for these functions.
Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
Geoff Mendal [Mon, 23 Nov 2015 17:58:21 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
d273c053ce -s ours
* commit '
d273c053ce85585d223d152bacf6e9e4c6859d1e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 23 Nov 2015 17:50:05 +0000 (18:50 +0100)]
Import translations. DO NOT MERGE
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 17:46:15 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
ae7c51a9cc -s ours
am:
57b3e7508d -s ours
* commit '
57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:38:52 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
ae7c51a9cc -s ours
* commit '
ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:32:02 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 23 Nov 2015 17:30:39 +0000 (18:30 +0100)]
Import translations. DO NOT MERGE
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
Sergio Giro [Mon, 23 Nov 2015 15:14:52 +0000 (15:14 +0000)]
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier in framework/base
DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56
Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
Geoff Mendal [Mon, 23 Nov 2015 13:51:05 +0000 (13:51 +0000)]
Import translations. DO NOT MERGE am:
b21b778567 -s ours am:
b96f640a77 -s ours
am:
816a167b29 -s ours
* commit '
816a167b2936a420d96f57f57005982e727745f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:43:48 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE am:
b21b778567 -s ours
am:
b96f640a77 -s ours
* commit '
b96f640a77b0c09868e104028d3bb9db3687018b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:36:02 +0000 (13:36 +0000)]
Import translations. DO NOT MERGE
am:
b21b778567 -s ours
* commit '
b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:26:59 +0000 (14:26 +0100)]
Import translations. DO NOT MERGE
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
Adam Lesinski [Fri, 20 Nov 2015 20:27:01 +0000 (20:27 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours am:
888916ff0f -s ours
am:
29db6ccb72 -s ours
* commit '
29db6ccb72b1b43568f2045825cf5435bd661e00':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 20 Nov 2015 20:20:14 +0000 (20:20 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours
am:
888916ff0f -s ours
* commit '
888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 20 Nov 2015 20:14:08 +0000 (20:14 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
am:
6902052c77 -s ours
* commit '
6902052c77bbcb9078b4ced243874f67542f64f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
Chris Tate [Fri, 20 Nov 2015 18:10:21 +0000 (18:10 +0000)]
Merge "Don\'t back up / restore EAP network definitions" am:
14a0981fde
am:
b5a38f6da5
* commit '
b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:05:04 +0000 (18:05 +0000)]
Merge "Don\'t back up / restore EAP network definitions"
am:
14a0981fde
* commit '
14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Don't back up / restore EAP network definitions"
Geoff Mendal [Fri, 20 Nov 2015 01:56:21 +0000 (01:56 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours am:
fd773d1ba7 -s ours
am:
b1a5fef946 -s ours
* commit '
b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
Import translations. DO NOT MERGE
Deepanshu Gupta [Fri, 20 Nov 2015 01:55:01 +0000 (01:55 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am:
35f7562495 am:
2d887558df
am:
0627cd0c40
* commit '
0627cd0c404838a0251ee359ed75041f430fa83b':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Fri, 20 Nov 2015 01:53:43 +0000 (01:53 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am:
8c971ae5a0 am:
867c370465
am:
4d9df358ec
* commit '
4d9df358ec847262872c09962105537be350f8fd':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Sreeram Ramachandran [Fri, 20 Nov 2015 01:52:25 +0000 (01:52 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0 am:
5d41bd8d1a am:
c1552f0caf
am:
38a3b2154c
* commit '
38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
Don't use framework permission strings for netd permissions.
Vineeta Srivastava [Fri, 20 Nov 2015 01:51:01 +0000 (01:51 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am:
013c7daedd
am:
cb948af246
* commit '
cb948af2469ca3869d368c0162dd459912afb0b9':
Fix MVNO hotspot bug for Europe
Geoff Mendal [Fri, 20 Nov 2015 01:40:42 +0000 (01:40 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours
am:
fd773d1ba7 -s ours
* commit '
fd773d1ba76c29b8888c71906ef44ec09a551627':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:30:35 +0000 (01:30 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours
am:
1bd58bfd5b -s ours
* commit '
1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours
am:
d0709c3a32 -s ours
* commit '
d0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am:
bddde9b83d -s ours
* commit '
bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
Guang Zhu [Fri, 20 Nov 2015 00:01:31 +0000 (00:01 +0000)]
add lost RAM info to compact meminfo dump am:
877c6c7742
am:
b681ec0219
* commit '
b681ec02194039768767215b2479507742288c98':
add lost RAM info to compact meminfo dump
Alex Deymo [Thu, 19 Nov 2015 23:50:25 +0000 (23:50 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
am:
8d31b08904
* commit '
8d31b089040dafefee16033176a884d43e259804':
Remove the aidl tool
Deepanshu Gupta [Thu, 19 Nov 2015 21:10:57 +0000 (21:10 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am:
35f7562495
am:
2d887558df
* commit '
2d887558dfa0b46fde5663fb494e2230febeaccc':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 21:09:24 +0000 (21:09 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am:
8c971ae5a0
am:
867c370465
* commit '
867c3704652d40118b47e9c97149e7fd9567a16b':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 21:00:17 +0000 (21:00 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
am:
35f7562495
* commit '
35f75624958bc061764c7cc71843ca7ea60c0666':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 20:58:52 +0000 (20:58 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
am:
8c971ae5a0
* commit '
8c971ae5a0d294175481426d4543e23dc8d4a349':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:55 +0000 (20:49 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:35 +0000 (20:49 +0000)]
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
This reverts commit
65a834980cdbb9407a3f27e48cd0a8c472182cd6.
The original revert was only for cherry-pick to release
branch.
Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
Deepanshu Gupta [Thu, 19 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:47:26 +0000 (20:47 +0000)]
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit
631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.
The revert is only for cherry-pick back to mnc-sdk-release.
Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
Sreeram Ramachandran [Thu, 19 Nov 2015 17:30:05 +0000 (17:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0 am:
5d41bd8d1a
am:
c1552f0caf
* commit '
c1552f0caf26bc79e5de6fdd15aa97900d6fd4aa':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 17:20:09 +0000 (17:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0
am:
5d41bd8d1a
* commit '
5d41bd8d1acd894cef1aff9018614194df6f95ab':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 17:10:45 +0000 (17:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500
am:
6d983179a0
* commit '
6d983179a047ff0e69fc06c06d3b9b06c32406ae':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:59:45 +0000 (16:59 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801
am:
974f805500
* commit '
974f8055005a3d75e45cab89badd9ef183a75107':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:50:11 +0000 (16:50 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205
am:
b776891801
* commit '
b7768918014d34c2e4d74abefeb03956aee421fc':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790
am:
33c1718205
* commit '
33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7
am:
d3b6e2d790
* commit '
d3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd
am:
42faa221d7
* commit '
42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012
am:
0b542630dd
* commit '
0b542630dd8b4d43f2e4f70563d3e44bb680455f':
Don't use framework permission strings for netd permissions.
Nicolas Geoffray [Thu, 19 Nov 2015 16:05:01 +0000 (16:05 +0000)]
Merge "Update framework code after new ART options." am:
d7d2817ade
am:
9da4055766
* commit '
9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
f1f45fe012
* commit '
f1f45fe012ddbd516e797099994c400a1cac8581':
Don't use framework permission strings for netd permissions.
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am:
d7d2817ade
* commit '
d7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
Vineeta Srivastava [Thu, 19 Nov 2015 05:50:36 +0000 (05:50 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev
am:
013c7daedd
* commit '
013c7daedd6be8a6a90b8c5e34de70be4144e746':
Fix MVNO hotspot bug for Europe
Vineeta Srivastava [Thu, 19 Nov 2015 00:22:59 +0000 (00:22 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
Andreas Gampe [Wed, 18 Nov 2015 18:11:11 +0000 (18:11 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive" am:
b61d3dd8a7
am:
a7e9f174c1
* commit '
a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
Guang Zhu [Wed, 18 Nov 2015 18:11:10 +0000 (18:11 +0000)]
add lost RAM info to compact meminfo dump
am:
877c6c7742
* commit '
877c6c7742d60fae387e51a4257dd90010064a8a':
add lost RAM info to compact meminfo dump
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am:
b61d3dd8a7
* commit '
b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
Nicolas Geoffray [Wed, 18 Nov 2015 17:21:41 +0000 (17:21 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0
am:
5485d81578
* commit '
5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
0f8f120839120da543ee186cf25ce6e215423e99)
Alex Deymo [Wed, 18 Nov 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
cf49583bd0
* commit '
cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
OSDN Git Service
