Erik Kline
fca0cc93ba
am 9a3cdadb: am 5a5745b3: Merge "Add basic netlink library code." into mnc-dev
...
* commit '9a3cdadb4cb79a3ab0e2a9ea3ba2365b5942ca34':
Add basic netlink library code.
2015-05-13 07:25:33 +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
89cc4809c8
am 002540f6: am 44b4add4: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
...
* commit '002540f6ee61fa787682251980efbe1f6ea73cae':
New "sm" shell tool to call StorageManager.
2015-05-13 05:50:05 +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
dbd83618a3
am 12aa8471: am a5c24e3b: Merge "Add IntentFilter auto verification - part 9" into mnc-dev
...
* commit '12aa8471cc68ae4ade25db94bfdbe197be296b67':
Add IntentFilter auto verification - part 9
2015-05-13 02:13:57 +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
4a786a1fde
am 16e03c33: am 94fa0387: Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev
...
* commit '16e03c33171323fc75f2640465e9c49b629b072f':
Add a temporary wrapper for ViewStructure until Webview APK is updated
2015-05-13 01:41:57 +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
e4be40fe0a
am 8d9f0790: am 221ffb26: Merge "Runtime permissions for system components not revokable - framework" into mnc-dev
...
* commit '8d9f079002e55ca872ec294eae5f524657746438':
Runtime permissions for system components not revokable - framework
2015-05-13 00:32:56 +00:00
Ruben Brunk
a5eea272be
am af1757ff: am 4143fbcf: Merge "camera2: Fix crop selection in LEGACY." into mnc-dev
...
* commit 'af1757ffd619480f4b231b4e545ddfa769ac36dd':
camera2: Fix crop selection in LEGACY.
2015-05-13 00:32:41 +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
Adam Powell
3d26822447
am bad22506: am 8c6cd908: Merge "Apply API feedback for ChooserTarget" into mnc-dev
...
* commit 'bad225069c719dc5c802fd758a4dd18acac1a2c4':
Apply API feedback for ChooserTarget
2015-05-13 00:13:21 +00:00
Ruben Brunk
4143fbcfa8
Merge "camera2: Fix crop selection in LEGACY." into mnc-dev
2015-05-13 00:09:50 +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
Alan Viverette
32440f6818
am 6276bdce: am c25771ce: Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev
...
* commit '6276bdce30009b1a12b6ce94ec8465ec694ee0c7':
Update scrollIndicators XML enums to match View constants
2015-05-12 23:55:07 +00:00
Svet Ganov
b3f22b48bb
Runtime permissions for system components not revokable - framework
...
Change-Id: I5b1d7bb1618ffa8d1231618ece47d0905c82f7bf
2015-05-12 16:49:19 -07: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
e652d17b3e
am 703b5078: am 0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev
...
* commit '703b507854a54229133bd4ef9289aedbbc2bb457':
Add hyphenationFrequency attribute to TextView and StaticLayout.
2015-05-12 23:21:59 +00: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
Xiyuan Xia
655c1e807e
am 0d3f7e65: am 55e603ee: Merge "Make PIN/Password/Pattern check async" into mnc-dev
...
* commit '0d3f7e65f1792586604a36859b72e474e4e05766':
Make PIN/Password/Pattern check async
2015-05-12 22:22:28 +00:00
Mike Lockwood
2b3f80c8a0
am a29558c5: am 62975ae4: Merge "MidiManager: Address API Council feedback:" into mnc-dev
...
* commit 'a29558c5c5001cdadf5f59fed35134bbfffe763b':
MidiManager: Address API Council feedback:
2015-05-12 22:22:23 +00:00
Xiyuan Xia
55e603ee9d
Merge "Make PIN/Password/Pattern check async" into mnc-dev
2015-05-12 22:08:10 +00: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
Mike Lockwood
62975ae43d
Merge "MidiManager: Address API Council feedback:" into mnc-dev
2015-05-12 22:02:45 +00: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
Mike Lockwood
7eb441cb4a
MidiManager: Address API Council feedback:
...
Rename MidiDeviceInfo.getPortList() to getPorts()
Rename MidiManager.getDeviceList() to getDevices()
Rename MidiReceiver.onReceive() to onSend()
Replace MidiManager.DeviceOpenCallback and BluetoothOpenCallback
with new interface MidiManager.OnDeviceOpenedListener
Add MidiSender.onConnect() and onDisconnect()
Add MidiReceiver.onFlush()
Ensure that MidiReceiver max message size is immutable
Bug: 21044677
Change-Id: I7711734a45e831e9744849a6f569e906feff9f80
2015-05-12 13:39:56 -07:00
Chien-Yu Chen
c7bc613fbe
am 58e591f6: am 4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev
...
* commit '58e591f6c1c79ef9d9d3808f6acb2e2e409342e0':
Camera2: stream configs for reprocessible session
2015-05-12 20:34:54 +00:00
Chien-Yu Chen
4f6615a30c
Merge "Camera2: stream configs for reprocessible session" into mnc-dev
2015-05-12 20:09:15 +00:00
Chris Craik
e972467930
am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
...
* commit 'ca0790cdcdd95028f3e34c72a64b14658250fe7f':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
2015-05-12 20:01:03 +00:00
Xiyuan Xia
6e38058908
Make PIN/Password/Pattern check async
...
- Add LockPatternChecker to support async security check;
- Migrate Keyguard UI to use the async check;
Bug: 20697812
Change-Id: I77002a12931feb17cc20923d7c917b3e37f2cd31
2015-05-12 12:42:38 -07: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
e467e764bc
am c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
...
* commit 'c1f055a809c27f2e512029dc5623c4405eddb9b3':
Remove obsolete fields from InputMethodManager.
2015-05-12 19:36:44 +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
P.Y. Laligand
86126f2f78
am d9a87d7c: am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev
...
* commit 'd9a87d7c748bc2c396df45aba656e30f134e3154':
DO NOT MERGE - Display mode switches.
2015-05-12 18:01:30 +00:00
Christopher Tate
ec8b095cdd
am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
...
* commit 'd990e4118a1688847e6fba2f9fcf1ed4532a6f46':
Deprecate Context.MODE_MULTI_PROCESS
2015-05-12 17:49:26 +00:00
Chris Craik
1d0b13b747
am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
...
* commit 'db05ea901041258a64477c51456c9092a826d0cf':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
2015-05-12 17:49:22 +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
Chris Craik
99aac0fc62
am f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
...
* commit 'f3aad32205f3e4acdfe092a78819cacdfec54f91':
Revert "Use default constructor to get anti-aliasing"
2015-05-12 17:33:00 +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
49979a3721
am 3ce689a4: am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
...
* commit '3ce689a4cdef8cc7f2be1bad001bb74a1d360909':
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
2015-05-12 16:53:14 +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
Paul Jensen
356a26122b
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
2015-05-12 16:32:29 +00:00
Andre Eisenbach
deb06b8551
am af78a8b6: am 14dcb5f1: Bluetooth native dumpsys logging support (3/5)
...
* commit 'af78a8b636c2f1afacea704dad851533435d989d':
Bluetooth native dumpsys logging support (3/5)
2015-05-12 16:22:40 +00:00