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

80119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geremy Condra
3a4832aa64 am 6e668238: (-s ours) am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit '6e66823873915bfd6e6c7b9b5c92e1e7e010977f':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:52:11 -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
0ed6f9a01f am 3430959c: am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:41:24 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:41:19 -07:00
Wink Saville
702182d340 am e0f8b91e: am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit 'e0f8b91e049b51770329c43e38aa88ccbb957104':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:41:16 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:41:13 -07:00
Wink Saville
f8030e419c am f75e3e01: am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'f75e3e01f6e574a411fa936e070a7a9f2f606da7':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:41:10 -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
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