Erik Kline
70bc35c4f7
am fca0cc93: am 9a3cdadb: am 5a5745b3: Merge "Add basic netlink library code." into mnc-dev
...
* commit 'fca0cc93ba59d9b80de41de315eb9fd137fdbfdd':
Add basic netlink library code.
2015-05-13 07:36:45 +00:00
Erik Kline
5a5745b30c
Merge "Add basic netlink library code." into mnc-dev
2015-05-13 07:05:00 +00:00
Erik Kline
6193aa3305
Add basic netlink library code.
...
Add netlink socket helpers and parsing code for basic netlink messages.
Additionally, support from some neighbor discovery -specific messages
is included.
Bug: 18581716
Change-Id: Ib2aa924222b63cdbebf09a8bf8ff35ee24269fc5
2015-05-13 15:18:39 +09:00
Jeff Sharkey
385e6dfd9e
am 89cc4809: am 002540f6: am 44b4add4: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
...
* commit '89cc4809c82538344aacdba7df882749b2f782de':
New "sm" shell tool to call StorageManager.
2015-05-13 06:00:35 +00:00
Jeff Sharkey
44b4add4ce
Merge "New "sm" shell tool to call StorageManager." into mnc-dev
2015-05-13 05:27:30 +00:00
Fabrice Di Meglio
b083f9f91d
am dbd83618: am 12aa8471: am a5c24e3b: Merge "Add IntentFilter auto verification - part 9" into mnc-dev
...
* commit 'dbd83618a3d5fe3a2ad5326f703a34013bb39821':
Add IntentFilter auto verification - part 9
2015-05-13 02:23:00 +00:00
Selim Gurun
8a92a48ed6
am 4a786a1f: am 16e03c33: am 94fa0387: Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev
...
* commit '4a786a1fdeff49f5d7dac56889a980cef0663418':
Add a temporary wrapper for ViewStructure until Webview APK is updated
2015-05-13 01:55:01 +00:00
Fabrice Di Meglio
a5c24e3bfe
Merge "Add IntentFilter auto verification - part 9" into mnc-dev
2015-05-13 01:53:08 +00:00
Selim Gurun
94fa03876e
Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev
2015-05-13 01:23:52 +00:00
Selim Gurun
0b408586c6
Add a temporary wrapper for ViewStructure until Webview APK is updated
...
It turned out that after the API change from ViewAssistStructure to
ViewStructure, the suggested mechanism did not work, and webview
started throwing abstractmethoderror exceptions. Temporarily
solve the problem by wrapping ViewStructure inside a
ViewAssistStructure. Once Webview APK is updated, drop it.
Change-Id: I09dfe7dac9c2bc7c037d842844c61dd879629470
2015-05-12 18:06:59 -07:00
Svet Ganov
7a706ae249
am e4be40fe: am 8d9f0790: am 221ffb26: Merge "Runtime permissions for system components not revokable - framework" into mnc-dev
...
* commit 'e4be40fe0aaa02f757b451fbf08fea0f1d2b0035':
Runtime permissions for system components not revokable - framework
2015-05-13 00:44:32 +00:00
Ruben Brunk
fe59861182
am a5eea272: am af1757ff: am 4143fbcf: Merge "camera2: Fix crop selection in LEGACY." into mnc-dev
...
* commit 'a5eea272bea4d3b61a0a171402c564f5a652a06d':
camera2: Fix crop selection in LEGACY.
2015-05-13 00:44:17 +00:00
Adam Powell
7483c85325
am 3d268224: am bad22506: am 8c6cd908: Merge "Apply API feedback for ChooserTarget" into mnc-dev
...
* commit '3d2682244766cc69d00a48b6b36daa0974e1dc95':
Apply API feedback for ChooserTarget
2015-05-13 00:34:43 +00:00
Svet Ganov
221ffb2662
Merge "Runtime permissions for system components not revokable - framework" into mnc-dev
2015-05-13 00:17:46 +00:00
Ruben Brunk
4143fbcfa8
Merge "camera2: Fix crop selection in LEGACY." into mnc-dev
2015-05-13 00:09:50 +00:00
Alan Viverette
39155a9b68
am 32440f68: am 6276bdce: am c25771ce: Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev
...
* commit '32440f68182d820f51ee4bc796849ba4b1bcb627':
Update scrollIndicators XML enums to match View constants
2015-05-13 00:08:03 +00:00
Fabrice Di Meglio
ef741da4d4
Add IntentFilter auto verification - part 9
...
- make verifyIntentFilter(int, int, List<String>) a SystemApi
See bug #19628271
Change-Id: I8b1f29da385867beb8b19829c124db1821450c41
2015-05-12 16:58:30 -07:00
Adam Powell
8c6cd9088e
Merge "Apply API feedback for ChooserTarget" into mnc-dev
2015-05-12 23:57:32 +00:00
Svet Ganov
b3f22b48bb
Runtime permissions for system components not revokable - framework
...
Change-Id: I5b1d7bb1618ffa8d1231618ece47d0905c82f7bf
2015-05-12 16:49:19 -07:00
Roozbeh Pournader
35a85ab057
am e652d17b: am 703b5078: am 0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev
...
* commit 'e652d17b3e8af3c4e8e3355cca864e61aad0dc35':
Add hyphenationFrequency attribute to TextView and StaticLayout.
2015-05-12 23:37:51 +00:00
Alan Viverette
c25771ce22
Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev
2015-05-12 23:34:15 +00:00
Alan Viverette
a789325a0f
Update scrollIndicators XML enums to match View constants
...
Bug: 21027462
Change-Id: I41e503e218253cf63bc44a82345f8b086261e379
2015-05-12 16:25:47 -07:00
Roozbeh Pournader
0ca0f58000
Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev
2015-05-12 22:59:47 +00:00
Jeff Sharkey
7d2af54a98
New "sm" shell tool to call StorageManager.
...
Surface basic StorageManager commands through shell tool, like
simple listing of disks and volumes, and commands like mounting and
partitioning.
The output is designed to be parsed by host-side testing tools,
instead of relying on fragile dumpsys parsing.
Bug: 19993667
Change-Id: I993e92ecf57996678965945f0ae648b392a77ea2
2015-05-12 15:52:43 -07:00
Adam Powell
13036beab1
Apply API feedback for ChooserTarget
...
* Add better docs to ChooserTarget
* Change ChooserTarget to use android.graphics.drawable.Icon instead
of Bitmap
* Preserve EXTRA_REFERRER when starting ChooserTargets
Bug 21045119
Change-Id: If859b86344cebaed3eaae477af132e7d7600aba6
2015-05-12 15:06:24 -07:00
Roozbeh Pournader
95c7a13f2a
Add hyphenationFrequency attribute to TextView and StaticLayout.
...
This patch adds plumbing to TextView and StaticLayout to control the
frequency of automatic hyphenation used in laying out paragraphs.
Bug: 21038249
Change-Id: Ib45de190eb0a1ed738e69fd61f2b39561b11aec7
2015-05-12 14:56:57 -07:00
Chien-Yu Chen
4901af2798
am c7bc613f: am 58e591f6: am 4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev
...
* commit 'c7bc613fbeade78d392b0601044595b5cbc63db8':
Camera2: stream configs for reprocessible session
2015-05-12 20:47:06 +00:00
Chris Craik
c6f9023ab1
am e9724679: am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
...
* commit 'e9724679302ddb0d83fa24d782601db7de30c050':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
2015-05-12 20:11:48 +00:00
Chien-Yu Chen
4f6615a30c
Merge "Camera2: stream configs for reprocessible session" into mnc-dev
2015-05-12 20:09:15 +00:00
Yohei Yukawa
59de3f828a
am e467e764: am c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
...
* commit 'e467e764bc3abba352b117397454df3082068dc3':
Remove obsolete fields from InputMethodManager.
2015-05-12 20:00:50 +00:00
Chris Craik
6af2857ae0
Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
2015-05-12 19:40:26 +00:00
Yohei Yukawa
6d090c42a7
Remove obsolete fields from InputMethodManager.
...
IMM#mViewTopLeft and IMM#mViewToScreenMatrix are no longer used.
They should have not been removed in
I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef.
Change-Id: Ia685956c8f7dda1143135345ee9a3873705975ef
2015-05-12 11:11:27 -07:00
Christopher Tate
8362ae1f98
am ec8b095c: am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
...
* commit 'ec8b095cdd2b6dfbe7225580e004cf2c03975468':
Deprecate Context.MODE_MULTI_PROCESS
2015-05-12 18:00:48 +00:00
Chris Craik
8420acd268
am 1d0b13b7: am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
...
* commit '1d0b13b74797b27bd431d68f25fdd5e7c5ec751a':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
2015-05-12 18:00:43 +00:00
Chris Craik
4538cdbbb0
am 99aac0fc: am f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
...
* commit '99aac0fc62a0b6f28bc732cd2153f8883ec7f09f':
Revert "Use default constructor to get anti-aliasing"
2015-05-12 17:49:24 +00:00
Chris Craik
6a49ddef62
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
...
Fix import
This reverts commit 7ed1431c83 .
Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b
2015-05-12 10:44:30 -07:00
P.Y. Laligand
e6c47686f6
Merge "DO NOT MERGE - Display mode switches." into mnc-dev
2015-05-12 17:39:57 +00:00
Christopher Tate
54415439ca
Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
2015-05-12 17:28:28 +00:00
Chris Craik
7ed1431c83
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
...
This reverts commit dfe0a66cec .
Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a
2015-05-12 17:22:22 +00:00
Paul Jensen
15ffe7f491
am 49979a37: am 3ce689a4: am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
...
* commit '49979a37216a001d30bc618d20583dccbf481ec9':
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
2015-05-12 17:08:34 +00:00
Chris Craik
dfe0a66cec
Revert "Use default constructor to get anti-aliasing"
...
bug:20948129
This reverts commit 58fc522a69 .
Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46
2015-05-12 16:36:49 +00:00
Andre Eisenbach
2e4dd75f64
am deb06b85: am af78a8b6: am 14dcb5f1: Bluetooth native dumpsys logging support (3/5)
...
* commit 'deb06b85514f38773882b7cbc88cf02cad6ffa24':
Bluetooth native dumpsys logging support (3/5)
2015-05-12 16:34:16 +00:00
Paul Jensen
356a26122b
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
2015-05-12 16:32:29 +00:00
Andre Eisenbach
14dcb5f138
Bluetooth native dumpsys logging support (3/5)
...
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-05-12 15:56:39 +00:00
Jason Monk
9de4cc5770
am d8ee3c77: am deb356dd: am 2df11817: Merge "Add control for double tap to wake setting" into mnc-dev
...
* commit 'd8ee3c770fc0619e053a5aa793938d13a354acf4':
Add control for double tap to wake setting
2015-05-12 15:09:36 +00:00
Paul Jensen
9e59e12b86
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
...
All ConnectivityManager APIs taking a network type have been
deprecated so there should be no need to validate a network type.
bug:20647016
Change-Id: I2dcf24f58016e94aa814dda38cfc848366cc461c
2015-05-12 10:36:56 -04:00
Jason Monk
27bbb2d0a1
Add control for double tap to wake setting
...
Bug: 16875464
Change-Id: Ic1ad910dd38acbc68ef040b2acdf3696ec2c2e4e
2015-05-12 10:12:32 -04:00
Amith Yamasani
2c01a829ab
am f4534beb: am dc15e243: am bb9d9278: Merge "Idle timebase" into mnc-dev
...
* commit 'f4534beb26de3bdf0d5e391811d31ad0c653c366':
Idle timebase
2015-05-12 13:37:23 +00:00
Amith Yamasani
bb9d9278aa
Merge "Idle timebase" into mnc-dev
2015-05-12 13:04:31 +00:00
Michael Wright
9618088175
am 22fa94a1: am 0598d730: am 6959865f: Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
...
* commit '22fa94a10b41f2895ef2184e576aebd9d436d6bb':
Remove SLEEP and POWER from wake key list.
2015-05-12 12:46:41 +00:00