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

80089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
5a6b62400c am 21e13d9c: am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '21e13d9c7de1c2853eed5d35a74955e1865abfa4':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:33:53 -07:00
Jean-Baptiste Queru
21e13d9c7d am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '237fa1901fee9617e5e8073470bd4fb7a224541f':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:29:22 -07:00
Jean-Baptiste Queru
237fa1901f am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '68ecb32eed09e1c6e834269e8f0c248ccb4097cf':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:18:58 -07:00
Jean-Baptiste Queru
68ecb32eed Merge "stagefright aacenc: Move system headers before local headers" 2012-06-11 14:02:08 -07:00
Martin Storsjo
8606e6b4da stagefright aacenc: Move system headers before local headers 
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
 2012-06-11 23:32:42 +03:00
Fabrice Di Meglio
97eb02f16f Merge "Make GridView widget aware of layout direction" 2012-06-11 13:07:30 -07:00
Jean-Baptiste Queru
ca3148edf1 am 6e85ad7d: resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp 
* commit '6e85ad7d267f47ba3a367651a70d147725dc26ae':
  Avoid memory leak in the Shutdown confirmation dialog.
 2012-06-11 12:24:54 -07:00
Jean-Baptiste Queru
6e85ad7d26 resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp 
Change-Id: I44b2ba647fb3b208119d10aed3fa6fc85dddfb0d
 2012-06-11 12:20:36 -07:00
Jean-Baptiste Queru
80d21f2f83 am 19703b13: Merge "Avoid memory leak in the Shutdown confirmation dialog." 
* commit '19703b13a6201812ebcf73904feb700aeb1afb45':
  Avoid memory leak in the Shutdown confirmation dialog.
 2012-06-11 12:03:32 -07:00
Eric Fischer
d86927cb58 Merge "Import translations. DO NOT MERGE" 2012-06-11 11:57:24 -07:00
Eric Fischer
4dc7089f31 Import translations. DO NOT MERGE 
Change-Id: I845e08014966cf6ee5442f1511301d4b3faa0ab1
 2012-06-11 11:51:42 -07:00
Jean-Baptiste Queru
284caa5bfe am 7372505e: am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode" 
* commit '7372505e2f450f722afc07a1b2b0e28390150ad7':
  Fix Force Close when enable airplane mode
 2012-06-11 11:26:57 -07:00
Dianne Hackborn
1d5d7375ab am 5134d711: am 574352a7: am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner" 
* commit '5134d711d1ff0f0d0ba2df10d22742fb769835e0':
  frameworks/base: release references of UriPermissionOwner
 2012-06-11 11:26:54 -07:00
Jean-Baptiste Queru
f978979d15 am b8c6405f: resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp 
* commit 'b8c6405fda9c41541868773f40ddd29bb1fc7ed8':
  Performance: Activity manager perf unnecessary recalc of oom_adj
 2012-06-11 11:23:03 -07:00
Jean-Baptiste Queru
7372505e2f am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode" 
* commit '6c50da75f696c184590c6e27d25755ee428f2afc':
  Fix Force Close when enable airplane mode
 2012-06-11 11:22:15 -07:00
Dianne Hackborn
5134d711d1 am 574352a7: am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner" 
* commit '574352a796e6398ff4f2b7fb1e14ada035e9a47a':
  frameworks/base: release references of UriPermissionOwner
 2012-06-11 11:22:09 -07:00
Jean-Baptiste Queru
19703b13a6 Merge "Avoid memory leak in the Shutdown confirmation dialog." 2012-06-11 11:21:58 -07:00
Jean-Baptiste Queru
b8c6405fda resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp 
Change-Id: I973d361a9599b32f9eaced0748d984900590ea3d
 2012-06-11 11:01:19 -07:00
Dianne Hackborn
be782a6aa0 am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev 
* commit '3857681e5885b64e593dcc3e28492b156d860ed3':
  Include important native processes in watchdog stacks.
 2012-06-11 10:44:52 -07:00
Dianne Hackborn
3857681e58 am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev 
* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
  Include important native processes in watchdog stacks.
 2012-06-11 10:41:09 -07:00
Dianne Hackborn
a7e3a1e0e7 Merge "Include important native processes in watchdog stacks." into jb-dev 2012-06-11 10:37:51 -07:00
Steve Block
ca2ef2cbb1 Merge "Fix style for Geolocation mock mechanism" 2012-06-11 10:32:35 -07:00
The Android Open Source Project
bb68d6f893 am 8f3523b0: Reconcile with jb-release 
* commit '8f3523b020c5fd12f4b358a4f34fe1e108145ccf':
  Bug 6605167: Turning off FUL during error counts as attempt
  Protect against bogus input for ListViews
 2012-06-11 09:25:54 -07:00
The Android Open Source Project
8f3523b020 Reconcile with jb-release 
Change-Id: Iad375a456e4243fce9a4e651d1c831dc5bd69451
 2012-06-11 09:20:57 -07:00
Jean-Baptiste Queru
6c50da75f6 am 7d77977f: Merge "Fix Force Close when enable airplane mode" 
* commit '7d77977ffab9b5d7d154894afda2c70def1222f5':
  Fix Force Close when enable airplane mode
 2012-06-11 08:43:08 -07:00
Ben Murdoch
c3c682fc12 Add missing </head> tag to last commit. 
See Ifca486e329333b642d8195391fb1829bbf9a684c

Change-Id: I2e9f0288176896d965cc25684b229f93ad46f013
 2012-06-11 15:52:37 +01:00
Ben Murdoch
963a7307e9 Add JavaBridge test to ensure objects injected into child frames. 
Child frames should have also have any injected javascript interfaces
from the main frame. Add a test to verify this behavior.

Bug: 6640270

Change-Id: Ifca486e329333b642d8195391fb1829bbf9a684c
 2012-06-11 15:29:15 +01:00
Jean-Baptiste Queru
7d77977ffa Merge "Fix Force Close when enable airplane mode" 2012-06-11 07:27:05 -07:00
The Android Automerger
64fd4fb65a merge in jb-release history after reset to jb-dev 2012-06-11 07:02:43 -07:00
Mattias Petersson
8b4b63403a Avoid memory leak in the Shutdown confirmation dialog. 
How to reproduce:
1) Lock the screen.
2) Open the Phone options menu by long pressing the power
   button.
3) Tap "Power off" to display the confirmation dialog.
4) Repeat step 2 and 3 a few times (without closing the
   confirmation dialog.

Each time the confirmation dialog is displayed, a new
instance is created. A stack of confirmation dialogs are
created on the screen.

This is fixed by making sure the previous dialog is
dismissed before launching a new dialog.

Change-Id: I6b6c61ccc56364b66eed3528019f761e75bbe268
 2012-06-11 10:18:09 +02:00
Chet Haase
0163b175d3 am fdb67a4d: am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev 
* commit 'fdb67a4dda0da858eba2103f899250acf9a221e5':
  Don't allow apps to request scrolls to out-of-bounds positions
 2012-06-10 12:37:54 -07:00
Chet Haase
fdb67a4dda am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev 
* commit '913bf80416a81f2783376939e7ad0b956975b05c':
  Don't allow apps to request scrolls to out-of-bounds positions
 2012-06-10 12:33:19 -07:00
Chet Haase
913bf80416 Merge "Don't allow apps to request scrolls to out-of-bounds positions" into jb-dev 2012-06-10 12:30:33 -07:00
Svetoslav Ganov
cce365a505 am 2622a7cd: am b7726159: Merge "Crash in the touch explorer." into jb-dev 
* commit '2622a7cd6e923a88ffbdd1925a9112a7b141fb04':
  Crash in the touch explorer.
 2012-06-10 10:06:37 -07:00
Svetoslav Ganov
2622a7cd6e am b7726159: Merge "Crash in the touch explorer." into jb-dev 
* commit 'b7726159e3ee29b45381ede8446c1e87fbbaa23a':
  Crash in the touch explorer.
 2012-06-10 10:02:40 -07:00
Svetoslav Ganov
b7726159e3 Merge "Crash in the touch explorer." into jb-dev 2012-06-10 09:59:24 -07:00
Svetoslav Ganov
a656414e94 am 3dbb70ec: am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 
* commit '3dbb70ec9c593e11dd19efa528a99e9ec21d63e0':
  Settings crash after enabling TalkBack accessibility.
 2012-06-10 09:57:18 -07:00
Svetoslav Ganov
3dbb70ec9c am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 
* commit '86bbf70587602c1fd86fce1a2a4be78da45aaedc':
  Settings crash after enabling TalkBack accessibility.
 2012-06-10 09:53:17 -07:00
Svetoslav Ganov
86bbf70587 Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 2012-06-10 09:50:24 -07:00
Dianne Hackborn
8e4e795936 am a8e46828: am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method" 
* commit 'a8e46828bf463cf542885d7726310abeac915e0a':
  Fix dumpPowerState method
 2012-06-08 19:00:38 -07:00
Dianne Hackborn
a8e46828bf am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method" 
* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2':
  Fix dumpPowerState method
 2012-06-08 18:55:56 -07:00
Dianne Hackborn
574352a796 am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner" 
* commit 'aa8cac86d8f41eaf89f9e78492db2dc5c3052e0c':
  frameworks/base: release references of UriPermissionOwner
 2012-06-08 18:51:18 -07:00
Dianne Hackborn
cddaf4d572 am 2d18c60a: Merge "Performance: Activity manager perf unnecessary recalc of oom_adj" 
* commit '2d18c60a0b16c4abac54d373731f4b4afc74e283':
  Performance: Activity manager perf unnecessary recalc of oom_adj
 2012-06-08 18:51:14 -07:00
Dianne Hackborn
c99e6ee202 am c9aa32e9: Merge "Fix dumpPowerState method" 
* commit 'c9aa32e93f39f84033e4ac812efec662a1f824ac':
  Fix dumpPowerState method
 2012-06-08 18:51:11 -07:00
Dianne Hackborn
aa8cac86d8 Merge "frameworks/base: release references of UriPermissionOwner" 2012-06-08 18:45:10 -07:00
Dianne Hackborn
2d18c60a0b Merge "Performance: Activity manager perf unnecessary recalc of oom_adj" 2012-06-08 18:40:04 -07:00
Dianne Hackborn
f72467ad98 Include important native processes in watchdog stacks. 
Helps us track down deadlocks involving native service processes.

Bug: 6615693
Change-Id: I580047550772e29586195a8cf440141574e3f40c
 2012-06-08 18:36:48 -07:00
Dianne Hackborn
c9aa32e93f Merge "Fix dumpPowerState method" 2012-06-08 18:33:48 -07:00
Svetoslav Ganov
e45c0b230b Crash in the touch explorer. 
1. The touch explorer was notified for accessibility events from
   a binder thread which was poking the internal state of the
   latter which by design is not tread safe. Since the touch
   explorer is expected to be running only on the main thread
   the accessibility manager service delivers the accessibility
   events to the explorer on that thread.

bug:6635496

Change-Id: Ifdc5329e4be8e485d7f77f0fb472184494fa0d15
 2012-06-08 17:49:52 -07:00
Victoria Lease
c3672a4e19 am 2203fab2: am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 
* commit '2203fab24966c80af5c37f0a58263218dbbcd610':
  Fix fake bold for fallback fonts in frameworks.
 2012-06-08 17:33:35 -07:00