drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,282 Commits 1 Branch 0 Tags
Commit Graph

27735 Commits

Author SHA1 Message Date
Jeff Brown
ece0206d12 Merge "Fix cursor window leak when query execution fails." 2013-01-08 15:57:37 -08:00
Jeff Brown
c21b5a019c Fix cursor window leak when query execution fails. 
Ensure that the Cursor object is closed if a query on a
content provider fails due to an error or is canceled during
execution.  There are several places in the code where
similar problems can occur.

To further reduce the likelihood of leaks, close the cursor
window immediately when a query fails.

Bug: 7278577
Change-Id: I8c686c259de80a162b9086628a817d57f09fdd13
 2013-01-08 15:32:50 -08:00
Martijn Coenen
4cef9969f5 Merge "Don't IPC for every onPause() in NfcActivityManager." 2013-01-08 12:40:37 -08:00
Dianne Hackborn
7c208410d7 am 609d79a0: am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case" 
* commit '609d79a0ddf7efadf62d6836f6b03dbfbfa7b41d':
  Handle nested folder case
 2013-01-08 10:27:27 -08:00
Mikhail Naganov
2ede422695 Merge "Update JavaDoc for WebSettings.{get|set}UseWideViewPort" 2013-01-08 01:51:02 -08:00
Craig Mautner
4b71aa1f8a Move app transition constants 
Move app transition constants from WindowManagerPolicy to
AppTransition.

Change-Id: I8ae6c4d0da1db826c44eb4ea0c6b85016b50b1a3
 2013-01-07 23:38:57 -08:00
Martijn Coenen
1360c555a4 Don't IPC for every onPause() in NfcActivityManager. 
The NfcService now contains additional code to make sure
that the registered NDEF callback corresponds to the package
running in the foreground. This allows us to stop calling
the NfcService on every onPause() to register the NDEF callback,
as NfcService itself will now detect that the app is no longer
in the foreground, and won't call the callback.

Bug: 5199662
Change-Id: Ibd0d21f8c7b76346238305a6684967263cb7d7e0
 2013-01-07 16:41:15 -08:00
Dianne Hackborn
c02bbfb3ea am 9fae2ecc: Merge "Handle nested folder case" 
* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case
 2013-01-07 15:56:20 -08:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
017129481b am 449f006f: am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents" 
* commit '449f006f9391b8c42d6d95ba06970216e8ef9f84':
  Correcting typo in doc of MEDIA_XXX intents
 2013-01-07 12:24:09 -08:00
Dianne Hackborn
dff561f42b am 9b59509c: am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 
* commit '9b59509c6a94f1943ce64d3b5e9b4de2aa846d4d':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
 2013-01-07 12:23:59 -08:00
Dianne Hackborn
2a8de804a2 am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents" 
* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
  Correcting typo in doc of MEDIA_XXX intents
 2013-01-07 12:16:40 -08:00
Dianne Hackborn
138a3d3f1a am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
 2013-01-07 12:16:23 -08:00
Romain Guy
7d1c4fa322 Remove out-of-date comment and rename constant 
Change-Id: I0c60d349505776cff0d7e5360e87ac5584dc5876
 2013-01-07 11:55:27 -08:00
Romain Guy
4a62374544 Merge "Fix issue when toggling profiling from visual to off to visual" 2013-01-07 11:31:49 -08:00
Romain Guy
666d5daab2 Fix issue when toggling profiling from visual to off to visual 
Change-Id: I4a623020a9bf0079029d184c13e58d92e692faf8
 2013-01-07 11:29:14 -08:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Romain Guy
31ffc57139 Merge "Update profiling properties" 2013-01-07 11:20:20 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Romain Guy
a4fef0260b Update profiling properties 
This change merges debug.hwui.profiling and profiling_visualize.
Now only the first property exists and accepts the values true, false
and visual. This enables setting the property from Settings.

Change-Id: I16a11fe23ac1a6bb907a1a826e418d6b3994b56c
 2013-01-07 11:18:38 -08:00
Romain Guy
e1730e77a3 Merge "Use dp units instead of px to draw profiling graph" 2013-01-07 11:00:13 -08:00
Romain Guy
98e4a52cc0 Use dp units instead of px to draw profiling graph 
Change-Id: Iba24b21ebe46738c6b1d6d320ce34af71f7c769d
 2013-01-07 10:58:34 -08:00
Mikhail Naganov
cb000a68cb Update JavaDoc for WebSettings.{get|set}UseWideViewPort 
Based on a black-box inspection of WebView behavior.

Change-Id: I8823dab9ef2302cf7d11abec87a64e854db9e116
 2013-01-07 17:54:19 +00:00
Alon Albert
35d67ec31a Merge "Put some useful information in User-Agent Header" 2013-01-07 09:18:52 -08:00
Jeff Sharkey
0ada5d656d Merge "Expose roaming flag for testing." 2013-01-05 09:51:20 -08:00
Romain Guy
63e2098b74 Merge "Make profiling graph more readable in all apps" 2013-01-04 19:32:50 -08:00
Romain Guy
63f4d84ec2 Make profiling graph more readable in all apps 
Change-Id: Ic9467d4420c2aa8d295d0045c714c9f8e6269220
 2013-01-04 19:31:12 -08:00
Romain Guy
9acd1b4fa8 Merge "Add visual profiling feature" 2013-01-04 19:24:10 -08:00
Romain Guy
672433d90f Add visual profiling feature 
When profiling is enabled with debug.hwui.profile set to true,
setting debug.hwui.profile_visualizer to true will display the
profiling data directly on screen.

Change-Id: I3d5fe3f0347090815087b1cbfce66b8e76d9347b
 2013-01-04 19:21:54 -08:00
Brian Carlstrom
305efe23a3 am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '498eaf58ad399e42cf7b3aca020b828c35023288':
  Use most specific attributes for distinguished name display
 2013-01-04 17:50:52 -08:00
Brian Carlstrom
bc7d5a55b2 am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display
 2013-01-04 15:47:39 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display 
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
 2013-01-04 15:27:24 -08:00
Selim Gurun
5c11ef10db Remove doc references to private browsing. 
Remove reference to private browsing since it is no longer supported.

Change-Id: I65bc8aecd949717f662454d4bd1759ca91ad553d
 2013-01-04 14:58:36 -08:00
suyi Yuan
be7af83829 Correcting typo in doc of MEDIA_XXX intents 
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.

Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
 2013-01-04 21:21:59 +08:00
Roger Chen
1740ada533 Handle nested folder case 
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-01-03 18:39:34 -08:00
Adam Powell
4b816cc269 am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:43:43 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:37:49 -08:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Christopher Tate
a82fe9faa1 Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)" 2013-01-03 15:40:26 -08:00
Jeff Sharkey
836ecb539f Expose roaming flag for testing. 
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
 2013-01-03 14:07:46 -08:00
Christopher Tate
2bc6eb8c17 Document ContentProvider's API a bit more explicitly 
In particular, call out parameters that must not be null.

Change-Id: I67af73163e36efefefa7df86499937f998be5b00
 2013-01-03 12:16:54 -08:00
Christopher Tate
116751d84f Shrink Bundle.getString(key, default) and getCharSequence(key, default) 
They previously duplicated the full logic of getString(key) and
getCharSequence(key) independently.  Now they both use the no-default
version internally,  resulting both in a single point of implementation
for test & isolation purposes and in a (small) decrease in code size.

Change-Id: If1b1e1fa4a549a0ec4cf221e54998f4fd438f3a2
 2013-01-02 14:01:03 -08:00
Siva Velusamy
af80cdd7df Merge "DdmServer: add controls for OpenGL tracing" 2013-01-02 09:10:06 -08:00
Kristian Monsen
d05e4d820d Merge "Update Geolocation.getInstance() comment." 2012-12-26 16:00:25 -08:00
Raph Levien
0925131933 Merge "Suppress horizontal scrolling with trailing blanks" 2012-12-20 15:46:23 -08:00
Raph Levien
afe8e9b6d0 Suppress horizontal scrolling with trailing blanks 
The existing behavior of EditText is that trailing blanks can cause a
line to exceed the layout width, causing the cursor to extend past the
line, which in turn causes horizontal scrolling. This patch clamps the
cursor to the layout width in the non-scrolling case, which makes the
spaces effectively invisible when they're at the end of the line, but at
least suppresses the scrolling.

The clamping only works reliably in left-to-right alignments, so this
patch checks for than and only enables the clamping in those cases.

Fix for bug 7699295.

Change-Id: I22bc4e6c9ded3d7716edfcf10dd2b5c31a5da9de
 2012-12-20 15:42:47 -08:00
Siva Velusamy
0c1761bd37 DdmServer: add controls for OpenGL tracing 
Add a new JDWP packet to allow control of OpenGL tracing.

Change-Id: Ic89e2f6299238a612df2f914581049f2cbba088c
 2012-12-19 16:31:56 -08:00
Justin Koh
e422737fda am a90c92a1: am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 
* commit 'a90c92a1c97830de5e1766bb64ff421a2a50ed56':
  Start RecognitionActivity with an upswipe gesture.
 2012-12-19 11:48:41 -08:00
Justin Koh
a90c92a1c9 am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 
* commit '86903699692a0b3229062da2995d829629e64e7b':
  Start RecognitionActivity with an upswipe gesture.
 2012-12-19 11:46:34 -08:00
Justin Koh
8690369969 Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 2012-12-19 11:42:26 -08:00