OSDN Git Service
Jeff Brown [Thu, 20 Jun 2013 00:46:24 +0000 (00:46 +0000)]
Merge "input: Handle a few extra error conditions."
kmccormick [Wed, 19 Jun 2013 23:48:14 +0000 (16:48 -0700)]
am
9551bcfd: am
fb45dbeb: am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
9551bcfd82ef8d3dd516829de77a5ba379953041':
Doc change: New class on avoiding save conflicts
kmccormick [Wed, 19 Jun 2013 23:43:17 +0000 (16:43 -0700)]
am
fb45dbeb: am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
fb45dbeb216f513905e3c2bb7a86da6558862f42':
Doc change: New class on avoiding save conflicts
kmccormick [Wed, 19 Jun 2013 23:41:07 +0000 (16:41 -0700)]
am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
748f6c854822c01ebf805202935037300d351104':
Doc change: New class on avoiding save conflicts
Romain Guy [Wed, 19 Jun 2013 23:40:57 +0000 (23:40 +0000)]
Merge "Fix regression: TextureView.setAlpha() was ignored"
kmccormick [Wed, 19 Jun 2013 23:38:33 +0000 (23:38 +0000)]
Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
Fabrice Di Meglio [Wed, 19 Jun 2013 22:12:50 +0000 (22:12 +0000)]
Merge "Fix bug #
9073962 - Carret is still on the left with an empty EditText in Arabic Locale"
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Doc change: New class on avoiding save conflicts
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Fabrice Di Meglio [Wed, 19 Jun 2013 03:03:41 +0000 (20:03 -0700)]
Fix bug #
9073962 - Carret is still on the left with an empty EditText in Arabic Locale
- fix StaticLayout special case with empty string or new line
Change-Id: Icb51feedce49db661ed17b6907eb0db83d0b763c
Jay Shrauner [Wed, 19 Jun 2013 21:14:16 +0000 (21:14 +0000)]
Merge "Add number presentation column to call log"
Wink Saville [Wed, 19 Jun 2013 20:24:03 +0000 (13:24 -0700)]
am
d11a3103: am
7f081794: am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
d11a3103046554e70023294446969a321779231a':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 20:21:41 +0000 (13:21 -0700)]
am
7f081794: am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
7f081794074c1356ba347b802729adf36f06ad19':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 20:19:02 +0000 (13:19 -0700)]
am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
c80e3d434f034d8594014df2fe028e9420930ea8':
TelephonyManager.listen can have notifyNow always true.
Romain Guy [Wed, 19 Jun 2013 19:17:01 +0000 (12:17 -0700)]
Fix regression: TextureView.setAlpha() was ignored
Change-Id: I9f43eec0fe23a65dcc1cf9cd0ac1f5e8907786a7
Romain Guy [Wed, 19 Jun 2013 19:16:21 +0000 (19:16 +0000)]
Merge "Share Caches' index buffer with FontRenderer"
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
TelephonyManager.listen can have notifyNow always true.
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.
This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.
Bug:
9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
Wink Saville [Wed, 19 Jun 2013 17:17:03 +0000 (10:17 -0700)]
am
42a6682e: am
a5dc5846: am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
42a6682ec62b4470f2c783c015d95fdc6f64610b':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:14:25 +0000 (10:14 -0700)]
am
a5dc5846: am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
a5dc5846502c13edd74ffd677d11e250b88ec17a':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:11:49 +0000 (10:11 -0700)]
am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
cc892d68c897f51b8998f7de11302bb9b9cebbff':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:09:28 +0000 (17:09 +0000)]
Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
Baligh Uddin [Wed, 19 Jun 2013 16:45:26 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Stephen Hines [Wed, 19 Jun 2013 16:38:19 +0000 (09:38 -0700)]
am
c3e2a616: am
6e0e9b48: am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
c3e2a61608e0d2d2b1d268c12ab760db5cdbab59':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 16:36:27 +0000 (09:36 -0700)]
am
6e0e9b48: am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
6e0e9b48d0722ff96cfc69af1474572ee194da68':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 16:35:06 +0000 (09:35 -0700)]
am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 07:11:21 +0000 (00:11 -0700)]
Update RenderScript doxygen reference manual.
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
Nick Kralevich [Wed, 19 Jun 2013 15:35:48 +0000 (15:35 +0000)]
Merge "NativeCrashListener: fix file descriptor leak."
Torne (Richard Coles) [Wed, 12 Jun 2013 15:02:03 +0000 (16:02 +0100)]
Enable preloading of the appropriate WebView.
Allow the appropriate WebView to be preloaded in the zygote by
constructing the currently selected WebViewFactoryProvider when the
WebViewFactory is preloaded. At runtime, if the preloaded provider is
still the current selection, the preloaded instance is used, otherwise
the provider is loaded at that time.
This change also removes "graceful" fallback from the experimental
WebView to the classic implementation: if the option to use the
experimental WebView is selected and it could not be loaded
successfully at the time a WebView is created, an exception will be
thrown, rather than allowing execution to continue with the classic
implementation, as the fallback may mislead developers who do not
examine logcat output in detail.
Change-Id: I0cd01c784d7048abeac55ab5863ca16b8fd9ecf2
Jason Sams [Wed, 19 Jun 2013 01:54:02 +0000 (01:54 +0000)]
Merge "Fix docs"
Jason Sams [Wed, 19 Jun 2013 01:52:42 +0000 (18:52 -0700)]
Fix docs
Change-Id: Ie6563f633481951d97f319aefd282b15c049e281
Jason Sams [Wed, 19 Jun 2013 01:24:33 +0000 (01:24 +0000)]
Merge "Update histogram docs."
Jason Sams [Wed, 19 Jun 2013 01:24:07 +0000 (01:24 +0000)]
Merge "Allow single channel and float convolve."
Jason Sams [Wed, 19 Jun 2013 01:23:37 +0000 (18:23 -0700)]
Update histogram docs.
Change-Id: I6cfedb5cac459befb083f352f43ed33f4418145a
Iliyan Malchev [Wed, 19 Jun 2013 01:21:50 +0000 (18:21 -0700)]
am
2a155213: am
66acbc22: am
0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '
2a155213c85f84a944551c09c0eefde3368267db':
Revert "wifi: Get full scan results"
Iliyan Malchev [Wed, 19 Jun 2013 01:20:41 +0000 (18:20 -0700)]
am
66acbc22: am
0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '
66acbc221b750a645a1c9581f4a5bbe52e38729c':
Revert "wifi: Get full scan results"
Iliyan Malchev [Wed, 19 Jun 2013 01:18:21 +0000 (18:18 -0700)]
am
0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '
0dff78aa32d8e7bc2eb057f2878a9e010417e42a':
Revert "wifi: Get full scan results"
Iliyan Malchev [Wed, 19 Jun 2013 01:16:23 +0000 (01:16 +0000)]
Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
Nick Kralevich [Wed, 19 Jun 2013 00:56:28 +0000 (17:56 -0700)]
NativeCrashListener: fix file descriptor leak.
Sending thousands of crashes can result in the system
eventually running out of file descriptors. Close file
descriptors after we're done with them.
Change-Id: I09ae9ce36426ded3fd591dda9a3550a19c2f01d3
Jason Sams [Tue, 18 Jun 2013 01:35:31 +0000 (18:35 -0700)]
Allow single channel and float convolve.
Change-Id: If448ea2ae38de2f8b95fc884ea0dbf8222964012
Jason Sams [Wed, 19 Jun 2013 00:34:34 +0000 (17:34 -0700)]
Add support for vec2 histogram
Change-Id: I30ab758a44485a8ea30043c4cd782c3560074c58
Jason Sams [Wed, 19 Jun 2013 00:26:38 +0000 (00:26 +0000)]
Merge "Add histogram intrinsic"
Craig Mautner [Tue, 18 Jun 2013 23:57:56 +0000 (23:57 +0000)]
Merge "Fix stack transfer bug."
Vineeta Srivastava [Mon, 17 Jun 2013 20:24:47 +0000 (20:24 +0000)]
Revert "wifi: Get full scan results"
This reverts commit
67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.
Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713
Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
Craig Mautner [Tue, 18 Jun 2013 23:52:43 +0000 (16:52 -0700)]
Fix stack transfer bug.
Set the focused stack to the task with the started activity. Do not refocus
when activities report resume.
Add more conditional debug.
Fixes bug
9481679.
Change-Id: Ib7134e88f9a2c8ad1703af0d43442c8bbe4e65dc
Fabrice Di Meglio [Tue, 18 Jun 2013 23:55:01 +0000 (23:55 +0000)]
Merge "Fix potential NPE if there is no child in HorizontalScrollView"
Svetoslav [Tue, 18 Jun 2013 23:29:25 +0000 (16:29 -0700)]
Correctly update the source of recurring subtree change accessibility events.
Change-Id: I0b0fd9224a5208b274e5c889a27417ef13579849
Jeff Brown [Tue, 18 Jun 2013 23:05:54 +0000 (16:05 -0700)]
input: Handle a few extra error conditions.
It turns out that SOCK_SEQPACKET sockets may sometimes return
ECONNREFUSED or ECONNRESET errors when the peer dies instead of
the usual EPIPE.
Bug:
9479906
Change-Id: Ia7e572b08bf63e43ba5aeda58281508beb5f8c73
Romain Guy [Tue, 18 Jun 2013 22:53:53 +0000 (15:53 -0700)]
Share Caches' index buffer with FontRenderer
This reduces state changes when we draw 9patches and text together,
which happens *a lot*. Also disable the NV profiling extension by
default since it doesn't play nice with display lists deferrals.
To enable it set debug.hwui.nv_profiling to true.
Change-Id: I518b44b7d294e5def10c78911ceb9f01ae401609
Fabrice Di Meglio [Tue, 18 Jun 2013 21:42:58 +0000 (14:42 -0700)]
Fix potential NPE if there is no child in HorizontalScrollView
- related to the previous change for saving the scroll position
- also related to bug #
9463581 NPE observed while launching News&Weather app from all apps tray
Change-Id: I9f2f8a246e793eefa1cf510e15a56a1058fb9c18
Jim Miller [Tue, 18 Jun 2013 22:41:19 +0000 (22:41 +0000)]
Merge "Move Keyguard to the systemui process."
Jeff Brown [Tue, 18 Jun 2013 22:36:37 +0000 (22:36 +0000)]
Merge "Add test for streaming display contents to an accessory."
Jeff Brown [Tue, 18 Jun 2013 22:36:28 +0000 (22:36 +0000)]
Merge "Add an API to allow for creating private virtual displays."
Jeff Brown [Wed, 29 May 2013 21:59:46 +0000 (14:59 -0700)]
Add test for streaming display contents to an accessory.
There are two applications: a source and a sink.
They should be installed on two separate Android devices.
Then connect the source device to the sink device using
a USB OTG cable.
Bug:
9192512
Change-Id: I99b552026684abbfd69cb13ab324e72fa16c36ab
Jeff Brown [Tue, 4 Jun 2013 07:02:38 +0000 (00:02 -0700)]
Add an API to allow for creating private virtual displays.
This change enables applications to create a private virtual
display that renders its content to a surface of its own creation.
The display is private in the sense that only the application
that owns the display is allowed to place windows upon it.
Mirroring and blanking is also disabled for these displays.
Bug:
9192512
Change-Id: I852ea07f0c7df1d244e354e3daca3a6960285ca0
Scott Main [Tue, 18 Jun 2013 22:29:08 +0000 (15:29 -0700)]
am
9f9f9012: am
c485361e: am
99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
* commit '
9f9f901200680b2dee5839d68bee4240b7aed21f':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Jim Miller [Wed, 12 Jun 2013 21:18:07 +0000 (14:18 -0700)]
Move Keyguard to the systemui process.
This should save some memory on devices with limited amounts of RAM
by allowing it to share the graphics context with systemui.
Initially, adding this to the systemui process triggered a bug where
the shared process id didn't exist in the table yet. The change to
ActiveServices tries to work around this by explicitly adding the package in
attachApplicationLocked().
Change-Id: I9e97d5d69ddd15d7f16aca83a57bdf381811a13b
Scott Main [Tue, 18 Jun 2013 22:26:58 +0000 (15:26 -0700)]
am
c485361e: am
99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
* commit '
c485361e9cf5768174310e9e65ee5df4614eb601':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Scott Main [Tue, 18 Jun 2013 22:25:06 +0000 (15:25 -0700)]
am
99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
* commit '
99700bfee02dd99e47bca5f0ab4e841239deda04':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Fabrice Di Meglio [Tue, 18 Jun 2013 21:54:49 +0000 (21:54 +0000)]
Merge "Fix bug #
9463581 NPE observed while launching News&Weather app from all apps tray"
Wink Saville [Tue, 18 Jun 2013 21:47:14 +0000 (14:47 -0700)]
Change default for config_show4GForLte to true.
Bug:
9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
Svetoslav [Tue, 18 Jun 2013 21:46:46 +0000 (21:46 +0000)]
Merge "Crash in ViewRootImpl when accessibility is on."
Svetoslav [Tue, 18 Jun 2013 21:43:43 +0000 (14:43 -0700)]
Crash in ViewRootImpl when accessibility is on.
We fire view subtree mutation events every X amount of time.
It was possible that the runnable that fires an event to be
scheduled more than once while this should not happen. As
a result there was a crash since we did not expect to have
a second run and nullified a reference.
bug:
9422804
Change-Id: I914e163b026cd217e1536ab0ed3a6b11113c2c73
Fabrice Di Meglio [Tue, 18 Jun 2013 21:09:07 +0000 (14:09 -0700)]
Fix bug #
9463581 NPE observed while launching News&Weather app from all apps tray
- dont suppose that there will always be one child
Change-Id: I51c5cdf06294af25c992cfbaacabbc29dd1b9ad3
Chiao Cheng [Tue, 18 Jun 2013 20:51:42 +0000 (20:51 +0000)]
Merge "Remove un-used snippetize method from ContactsContract."
Svetoslav [Tue, 18 Jun 2013 20:31:17 +0000 (20:31 +0000)]
Merge "Update Javadoc references"
Svetoslav [Tue, 18 Jun 2013 20:30:35 +0000 (13:30 -0700)]
Update Javadoc references
Change-Id: I2e4834070de6ebd55e6350f31f9f8e619cb0ff2d
Romain Guy [Tue, 18 Jun 2013 20:08:38 +0000 (20:08 +0000)]
Merge "Take hinting into account when caching fonts Bug #
9464403"
Zhijun He [Tue, 18 Jun 2013 20:06:21 +0000 (20:06 +0000)]
Merge "Add Y8 and Y16 image format"
Romain Guy [Tue, 18 Jun 2013 19:59:25 +0000 (12:59 -0700)]
Take hinting into account when caching fonts
Bug #
9464403
Change-Id: I26a5f0c17eb27d096717b444d3e18ad1d2b5a43c
Jason Sams [Tue, 18 Jun 2013 18:53:03 +0000 (11:53 -0700)]
Add histogram intrinsic
Change-Id: I67bcaaef033d8770047923e8243e739010238539
Geremy Condra [Tue, 18 Jun 2013 18:02:14 +0000 (18:02 +0000)]
Merge "Stop spewing errors into the logs."
Geremy Condra [Tue, 18 Jun 2013 17:38:27 +0000 (10:38 -0700)]
Stop spewing errors into the logs.
These are for debugging. Marking them that way.
Bug:
9479475
Change-Id: Ia0c27829583ecbab58a60a8c8350e9c099b812c2
Scott Main [Tue, 18 Jun 2013 17:43:35 +0000 (10:43 -0700)]
update supported media formats.
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
Svetoslav [Tue, 18 Jun 2013 17:42:26 +0000 (17:42 +0000)]
Merge "Adding traits APIs to AccessibilityNodeInfo."
Svetoslav [Thu, 6 Jun 2013 21:09:10 +0000 (14:09 -0700)]
Adding traits APIs to AccessibilityNodeInfo.
This change adds several traits and properties to AccessibilityNodeInfo
aiming to allow better description of native Android components to
accessibility services as well as mapping web content to native Android
node info tree.
Change-Id: I36b893cbaa6213c9d02d805e9dc36b6d792b4961
Jay Shrauner [Mon, 10 Jun 2013 17:10:11 +0000 (10:10 -0700)]
Add number presentation column to call log
Change call log so instead of overloading the phone number with special
strings "-1", "-2", etc to denote private phone numbers, payphones, etc,
put presentation type in its own column and expose in the public API these
type values.
Bug:
6948882
Change-Id: I230c26aa0428d605a0e83169a635b5bbf1aa4e3f
Zhijun He [Fri, 14 Jun 2013 16:36:02 +0000 (09:36 -0700)]
Add Y8 and Y16 image format
These APIs are hidden. Also correct the value of RAW_SENSOR.
Bug:
9254294
Change-Id: Ic6271f5f6bfcfdd8b545d69a9a2154241c34d73b
Jeff Sharkey [Tue, 18 Jun 2013 16:42:45 +0000 (16:42 +0000)]
Merge "Add generic sugar for ArrayMap and ArraySet."
Jeff Sharkey [Tue, 18 Jun 2013 16:27:23 +0000 (09:27 -0700)]
Add generic sugar for ArrayMap and ArraySet.
Change-Id: Id749bd41f2e53664c00a0199c14babd2b63087fb
Jeff Sharkey [Tue, 18 Jun 2013 16:17:17 +0000 (16:17 +0000)]
Merge "Use package name when caching SharedPreferences."
Scott Main [Tue, 18 Jun 2013 05:14:28 +0000 (22:14 -0700)]
am
8303a203: am
94ba190e: am
de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '
8303a2036efd93eecda6da1e481e1659a40ca12e':
some extra docs for TextDirectionHeuristic
Scott Main [Tue, 18 Jun 2013 05:13:17 +0000 (22:13 -0700)]
am
94ba190e: am
de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '
94ba190ebbd4fe7f8933d531cce7b4be8e04f287':
some extra docs for TextDirectionHeuristic
Scott Main [Tue, 18 Jun 2013 05:12:14 +0000 (22:12 -0700)]
am
de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '
de04dfb62dd43827c63c267003264966dd76c614':
some extra docs for TextDirectionHeuristic
Scott Main [Tue, 18 Jun 2013 05:10:32 +0000 (05:10 +0000)]
Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
Scott Main [Tue, 18 Jun 2013 02:27:26 +0000 (19:27 -0700)]
am
c5ad4610: am
c8b4658a: am
1a0a50e7: add collapsed list items for 4.1 TOC
* commit '
c5ad4610690f97a0dadfffa9bef29db115065a54':
add collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:25:00 +0000 (19:25 -0700)]
am
c8b4658a: am
1a0a50e7: add collapsed list items for 4.1 TOC
* commit '
c8b4658a5491cd6af322d47c96c00d0a77425f7f':
add collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:23:02 +0000 (19:23 -0700)]
am
1a0a50e7: add collapsed list items for 4.1 TOC
* commit '
1a0a50e7c23fb0ec5fe818a7069b890f22632691':
add collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:19:38 +0000 (19:19 -0700)]
add collapsed list items for 4.1 TOC
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
Scott Main [Thu, 23 May 2013 01:17:44 +0000 (18:17 -0700)]
some extra docs for TextDirectionHeuristic
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
Scott Main [Tue, 18 Jun 2013 01:41:29 +0000 (18:41 -0700)]
am
ea893536: am
c4473d10: am
27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '
ea8935362da192508a4ff945b47e0c7ff1239679':
add attributes reference for splimotionevents and layoutmode
Scott Main [Tue, 18 Jun 2013 01:39:18 +0000 (18:39 -0700)]
am
c4473d10: am
27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '
c4473d10ed747fb1e84efff7183023e0ecc1a493':
add attributes reference for splimotionevents and layoutmode
Scott Main [Tue, 18 Jun 2013 01:36:09 +0000 (18:36 -0700)]
am
27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '
27a8508ee1236ded652cd452b93884a9193654fc':
add attributes reference for splimotionevents and layoutmode
Craig Mautner [Tue, 18 Jun 2013 01:35:30 +0000 (01:35 +0000)]
Merge "Add new API getStackBoxInfo"
Craig Mautner [Mon, 17 Jun 2013 23:15:42 +0000 (16:15 -0700)]
Add new API getStackBoxInfo
Change-Id: Ie2861e5e31bb3876cfe2d5c3d04ff58bb3955634
Dianne Hackborn [Tue, 18 Jun 2013 01:33:49 +0000 (18:33 -0700)]
am
2f3f86c1: am
1d4cd879: am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
2f3f86c113f10b841b8597a05f724a996ba76641':
Avoid unnecessary FindClass("java/lang/String").
Scott Main [Mon, 10 Jun 2013 17:39:48 +0000 (10:39 -0700)]
add attributes reference for splimotionevents and layoutmode
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
Chiao Cheng [Tue, 18 Jun 2013 01:31:34 +0000 (18:31 -0700)]
Remove un-used snippetize method from ContactsContract.
Bug:
7896653
Change-Id: I5db6f9a58ce747605f66c681036795cdd3ed5d01
Dianne Hackborn [Tue, 18 Jun 2013 01:28:58 +0000 (18:28 -0700)]
am
1d4cd879: am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
1d4cd879044578cf7e2b37d45ef29abaabf7e662':
Avoid unnecessary FindClass("java/lang/String").
Jeff Sharkey [Tue, 18 Jun 2013 01:26:37 +0000 (18:26 -0700)]
Use package name when caching SharedPreferences.
Otherwise multiple applications using the same process can end up
leaking SharedPreferences instances between the apps.
Change-Id: I2eb0e693cebea1daf87a9176eb8c5a22b9e9ec0b
Dianne Hackborn [Tue, 18 Jun 2013 01:21:41 +0000 (18:21 -0700)]
am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
11cd57caee4058dab743b91e715d7469c59a5c2f':
Avoid unnecessary FindClass("java/lang/String").
Dianne Hackborn [Tue, 18 Jun 2013 01:14:37 +0000 (01:14 +0000)]
Merge "Avoid unnecessary FindClass("java/lang/String")."