Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,138 Commits 3 Branches 0 Tags
48d4ab73d5b60b677cbf6d4887a67e52e62fa20b
Commit Graph

24105 Commits

Author SHA1 Message Date
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
 2012-06-25 18:17:15 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
 2012-06-25 17:37:15 -07:00
Dianne Hackborn
17990395bc Merge "Fix issue #6717667: expanded notification actions don't work on the lock screen" into jb-dev 2012-06-25 17:35:36 -07:00
Michael Jurka
85a2d7f94e am c4d7721c: am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev 
* commit 'c4d7721cb08cc797ea592f54797135f372689f6a':
  Update documentation on max widget bitmap usage
 2012-06-25 15:31:25 -07:00
Michael Jurka
c4d7721cb0 am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev 
* commit '806a360275b3963d1941130ca2998a8abd76126f':
  Update documentation on max widget bitmap usage
 2012-06-25 15:28:48 -07:00
Michael Jurka
806a360275 Merge "Update documentation on max widget bitmap usage" into jb-dev 2012-06-25 15:26:48 -07:00
Michael Jurka
f25ab44975 Update documentation on max widget bitmap usage 
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
 2012-06-25 15:11:21 -07:00
Dianne Hackborn
1927ae8a56 Fix issue #6717667: expanded notification actions don't work on the lock screen 
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
 2012-06-25 14:28:48 -07:00
Scott Main
f20a2a8af8 am 451f0341: am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 
* commit '451f0341445e8a05933d2fc2d6ec2b1aa3683602':
  docs: clean up javadoc code snippets, unescaped entities
 2012-06-25 12:37:09 -07:00
Scott Main
451f034144 am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 
* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
  docs: clean up javadoc code snippets, unescaped entities
 2012-06-25 12:33:55 -07:00
Scott Main
97e0a1c6f3 docs: clean up javadoc code snippets, unescaped entities 
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
 2012-06-25 11:25:20 -07:00
Jean-Baptiste Queru
41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect
 2012-06-23 07:13:25 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
 2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -07:00
Irfan Sheriff
491906a7f1 Merge "Move ARP test functionality to ArpPeer" 2012-06-22 16:38:09 -07:00
Jeff Brown
dc6f8b2b8c Merge "Deprecate DatabaseUtils.InsertHelper." 2012-06-22 15:34:33 -07:00
Jeff Brown
b33eb4e32a Deprecate DatabaseUtils.InsertHelper. 
This class does not offer any advantages over SQLiteStatement
and just makes code more complex and error-prone.

Documented that the class is not thread-safe.

Removed a potential deadlock in insert() and replace() caused
by the insertInternal() method being synchronized in the case
where the class was being used concurrently (woe to you!).

Thread A would start a transaction.
Thread B would call insertInternal() and acquire the object monitor,
but block because it could not obtain the db connection because
thread A is holding onto it.
Thread A would call insertInternal() and block because Thread B
was holding the object monitor.
Deadlock.

Changed this code to use a transaction instead of a lock,
which provides the necessary mutual exclusion guarantee without
the potential for a deadlock.  Even so, the class really isn't
thread safe.

Bug: 6625094
Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
 2012-06-22 15:24:26 -07:00
Scott Main
adba6ffbb9 am 101a120c: am 9be0105f: docs: fix several links 
* commit '101a120c27f68fb7d44e6221244cb9441dfc4285':
  docs: fix several links
 2012-06-22 13:35:52 -07:00
Scott Main
101a120c27 am 9be0105f: docs: fix several links 
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
  docs: fix several links
 2012-06-22 13:33:30 -07:00
Scott Main
9be0105fbc docs: fix several links 
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
 2012-06-22 12:35:08 -07:00
Adam Powell
6081420604 am 92a175ca: am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 
* commit '92a175ca6fae7b607d81f632b14b2219c64dc791':
  Avoid memory leak by only registering callback while attached to window.
 2012-06-22 10:48:20 -07:00
Adam Powell
92a175ca6f am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
  Avoid memory leak by only registering callback while attached to window.
 2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448 Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 2012-06-22 10:44:27 -07:00
George Mount
5048cd77dc Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS" 2012-06-22 10:29:50 -07:00
George Mount
fb4d37cd17 Merge "Remove password change from updateTextfield." 2012-06-22 10:29:36 -07:00
Jack Palevich
101c449152 Avoid memory leak by only registering callback while attached to window. 
Bug: 6710307
Change-Id: Idf57251e6feb48ec3e75e797144ff800fa874cc8
 2012-06-22 16:06:57 +08:00
Adam Powell
7527b369af am 8e453a03: am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev 
* commit '8e453a034183e8688e05d0c6991608626702d56f':
  Allow ungrouping media routes when a group is the only alternate route
 2012-06-21 16:47:40 -07:00
Kenny Root
287a64af97 am ae017c55: am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks." 
* commit 'ae017c55824ca345186b0c9fc204401153bd8a23':
  Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
 2012-06-21 16:47:26 -07:00
Daniel Sandler
60abfa5c3a am 63d842cc: am d5353b47: Fix docs 
* commit '63d842cc4da3c2eb998aaf9adacbf20e833dff02':
  Fix docs
 2012-06-21 16:46:28 -07:00
Adam Powell
8e453a0341 am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev 
* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
  Allow ungrouping media routes when a group is the only alternate route
 2012-06-21 15:52:28 -07:00
Adam Powell
f7e0a328c9 Allow ungrouping media routes when a group is the only alternate route 
Fix a MediaRouteButton bug where group item counts weren't taken into
account when deciding whether to toggle between two available groups
or show the chooser dialog.

Change-Id: I6400ffd4cfe80c8072c5be360264b8ca91d71c41
 2012-06-21 15:29:40 -07:00
Irfan Sheriff
55b9821dff Move ARP test functionality to ArpPeer 
Change-Id: Iecd6037cf8e0faa626ba6c27cef014822a6bc61b
 2012-06-21 15:08:29 -07:00
Kenny Root
ae017c5582 am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks." 
* commit 'a9543a3dad0da58f30580bdf99b76bc2ab97a2df':
  Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
 2012-06-21 14:17:13 -07:00
Chris Wren
bae2fe870a resolved conflicts for merge of 0a43f67e to master 
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
 2012-06-21 16:46:14 -04:00
Romain Guy
eb129a266c am 16613476: am 0d6f4c06: Dejank: don\'t allocate when scrolling lists 
* commit '16613476c80f20736ef6bd3d217ab56aa57b03c9':
  Dejank: don't allocate when scrolling lists
 2012-06-21 12:03:58 -07:00
Daniel Sandler
63d842cc4d am d5353b47: Fix docs 
* commit 'd5353b475001f19e3cbc9c1a4165c9e6038a812f':
  Fix docs
 2012-06-21 11:52:38 -07:00
Daniel Sandler
0a43f67ef3 am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev 
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
  Unhide new methods on RemoteViews and Notification.
 2012-06-21 11:52:34 -07:00
Romain Guy
16613476c8 am 0d6f4c06: Dejank: don\'t allocate when scrolling lists 
* commit '0d6f4c06df0b0e35125f088ca028c7226b274dc4':
  Dejank: don't allocate when scrolling lists
 2012-06-21 11:52:22 -07:00
Kenny Root
a9543a3dad Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks." 2012-06-21 11:05:55 -07:00
George Mount
d594047f8f Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS 
Remove an unused #define and code associated with it. This will
 smooth a possible future webkit merge.
 WebKit change: I16d8c457a3f08996bc66401b241fe0db5a118975

Change-Id: Ibf046337cdabb9bee9cff8e3d77d9f69a59ecb15
 2012-06-21 10:19:56 -07:00
Daniel Sandler
d5353b4750 Fix docs 
Change-Id: Ic5ff9aa07e65166a4ecaeecc5fb5e0091275bdcc
 2012-06-21 09:29:51 -04:00
Daniel Sandler
790024bfe6 Merge "Unhide new methods on RemoteViews and Notification." into jb-dev 2012-06-21 06:04:43 -07:00
Romain Guy
0d6f4c06df Dejank: don't allocate when scrolling lists 
The new display list properties introduces in JB were causing numerous
and expensive memory allocations while scrolling lists. During a scroll
ListView sometimes attempts to apply an offset to views before they are
drawn for the first time. This had the side effect of generating a new
IllegalStateException and its entire stack trace. The exception was
caught inside the display list and never seen by users.

Generating an exception is very expensive both in terms of allocated
memory and CPU time spent crawling the stack.

List scrolls/flings are a common case of this issue but it also happens
during various types of animations. A simple alpha animation, for instance,
can cause the problem to occur.

Another side effect of this issue is more frequent and longer GC pauses.

Change-Id: Ic1b37cc84f7c8f290209cfb990d030e96d6e0dc7
 2012-06-21 00:39:35 -07:00
Hung-ying Tyan
9c42639cdd am cc9a4e3e: am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 
* commit 'cc9a4e3e2a3716965cd0b76d48e8e840e6ce0f41':
  Fix crash when SimpleCursorAdapter changes cursor from null
 2012-06-20 22:34:28 -07:00
Hung-ying Tyan
cc9a4e3e2a am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 
* commit '927c7fd1fec8ff26fd4bf8cc64eb12dd634cb60b':
  Fix crash when SimpleCursorAdapter changes cursor from null
 2012-06-20 22:31:00 -07:00
Daniel Sandler
064f9907c9 Unhide new methods on RemoteViews and Notification. 
Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
 2012-06-21 00:15:01 -04:00
Hung-ying Tyan
927c7fd1fe Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 2012-06-20 17:56:40 -07:00