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

78854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp 
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
 2012-06-12 11:10:26 -07:00
Geremy Condra
6e66823873 am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:47:16 -07:00
Geremy Condra
e1b573a32b am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'b4151b296fbeb39a367bb9930d605180d683ca11':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:43:10 -07:00
Geremy Condra
b4151b296f Merge "DO NOT MERGE Add API for file origin policy." 2012-06-11 16:53:43 -07:00
Dianne Hackborn
3430959c4d am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:36:52 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:36:49 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:36:46 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:36:42 -07:00
Wink Saville
f75e3e01f6 am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:36:39 -07:00
Dianne Hackborn
569f5bddd2 am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:32:29 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:32:26 -07:00
Wink Saville
4853f944ac am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '3fe79dfdf4ca63535ec9e586ebed553a862061ea':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:32:23 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:32:20 -07:00
Wink Saville
c07055c4a6 am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:32:17 -07:00
Dianne Hackborn
37d8ac1b56 Merge "SystemServer: Looper's getMainLooper to return ServerThread" 2012-06-11 16:02:34 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Wink Saville
3fe79dfdf4 Merge "Adds utility method to convert 0.25 secs to decimal degrees" 2012-06-11 15:58:26 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -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
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
Jeff Brown
926a5c507b Merge "Remove edge slop handling from ScaleGestureDetector." into jb-dev 2012-06-11 11:46:42 -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
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
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
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
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
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
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
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