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

117933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
37914bb0ce am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams" 
* commit 'a9b6a30f53cdb774db7c1a7ab3efb77ab9d3e53b':
 2013-12-05 19:26:08 +00:00
Dirk Dougherty
ea55d02b59 am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls. 
* commit 'd76ca645b757ec5684d0ca9a52cfbeb165ac5497':
 2013-12-05 19:25:36 +00:00
Alan Viverette
a2180eba3a am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount" 
* commit '13bcfdcabd83b240a1701ff5ea782bef5b9cd492':
 2013-12-05 19:25:28 +00:00
Todd Poynor
ba813d059c am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data 
* commit 'd159dc7cb5f6d4f0ef99ed8eb8081392fe187a06':
 2013-12-05 19:25:21 +00:00
Craig Mautner
cf69884463 am 1edbc766: am 9a04435e: Merge "Compare tasks not activities." 
* commit '1edbc766d090e600858648f32c3c231aaa93b24e':
 2013-12-05 19:25:13 +00:00
Amith Yamasani
4500fb330c am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps" 
* commit '1a18832c15584785bd19efaf30e196bcae408212':
 2013-12-05 19:25:04 +00:00
Brian Williammee
1c396eb73c am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks" 
* commit '58b6d489457b69d94fc19470bb9e78b794a2d51b':
 2013-12-05 19:24:57 +00:00
Glenn Kasten
fa7e5d9eb2 am 2021fba4: am d8405261: Merge "Update audio comments" 
* commit '2021fba46cc34beb073535fa603c22f6daf237b2':
 2013-12-05 19:24:49 +00:00
Dianne Hackborn
12f766d033 am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data." 
* commit '978efc2162560a2ad1f4b03e7ce361490121760f':
 2013-12-05 19:24:39 +00:00
Baligh Uddin
37a4625058 am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '2246e8c76b16d877131dee9b66eaca570c8c436f':
 2013-12-05 19:24:32 +00:00
Baligh Uddin
d7f043459d am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '45f2a4948fb0ec20491b50203d686cf9b5962d99':
 2013-12-05 19:24:22 +00:00
Ying Wang
6e2d0c1d91 Merge "wifi: Remove obsolete libwpa_client library" 2013-12-05 19:13:20 +00:00
Dmitry Shmidt
2a69b17309 wifi: Remove obsolete libwpa_client library 
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-12-05 10:50:48 -08:00
Ying Wang
ceddb389b4 am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions." 
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
  libcore_to_document and junit_to_document are no longer functions.
 2013-12-05 17:56:45 +00:00
Ying Wang
b33fe50a63 am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions." 
* commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd':
  libcore_to_document and junit_to_document are no longer functions.
 2013-12-05 09:47:04 -08:00
Ying Wang
dcbde1b02a Merge "libcore_to_document and junit_to_document are no longer functions." 2013-12-05 17:39:59 +00:00
Brian Carlstrom
4a657244b3 am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 
* commit '59595f7a3e8efcefc62bbcf8e085b6da6d8ea339':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
 2013-12-05 15:29:41 +00:00
Brian Carlstrom
59595f7a3e am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 
* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
 2013-12-05 07:25:20 -08:00
Brian Carlstrom
8026b2ce23 Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 2013-12-05 06:20:48 +00:00
Mathieu Chartier
a1a19d28d0 Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf. 
Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.

Bug: 11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
 2013-12-04 17:58:37 -08:00
John Huang
66a9ebfd2f am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication." 
* commit 'c91c7b4b5d61e2121cd60c5c27a6a8df0ecf155e':
  RIL changes for supporting generic SIM communication.
 2013-12-05 01:12:12 +00:00
John Huang
c91c7b4b5d am 2e12e052: Merge "RIL changes for supporting generic SIM communication." 
* commit '2e12e0522641649d363a1c6ede9be9af235197fa':
  RIL changes for supporting generic SIM communication.
 2013-12-04 17:09:18 -08:00
John Huang
2e12e05226 Merge "RIL changes for supporting generic SIM communication." 2013-12-05 00:59:36 +00:00
Ying Wang
50a0fd50f7 libcore_to_document and junit_to_document are no longer functions. 
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184

Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
 2013-12-04 16:58:59 -08:00
Craig Mautner
86ac3aab40 Merge "Eliminate StackBox." into klp-modular-dev 2013-12-04 23:00:00 +00:00
Dirk Dougherty
d5967e777e am e8b49c43: am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'e8b49c433156b450289a4cd7ff1a7c8d7f05ebb8':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 22:13:47 +00:00
Dirk Dougherty
e8b49c4331 am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'c09e0ee90e00acbde85a6b3ee4413ca6e245f601':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 14:09:59 -08:00
Dirk Dougherty
c09e0ee90e am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'c9cad879597dd15983a35fbf997898a771672a69':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 22:05:51 +00:00
Dirk Dougherty
c9cad87959 Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 2013-12-04 22:01:41 +00:00
Dirk Dougherty
56278b7e14 Doc change: add cropped kk device image and adjust position on highlights doc. 
Change-Id: I927091e1251c5477de4462a61c01c9bcf82ad9e2
 2013-12-04 13:55:59 -08:00
Geoff Mendal
ece1bc5174 am f6e6e160: (-s ours) am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit 'f6e6e1606234a5a9ee9c2eeb2f8c06392b2b7f10':
  Import translations. DO NOT MERGE
 2013-12-04 21:12:50 +00:00
Geoff Mendal
f6e6e16062 am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit '82af5d893102dfb51257f2a4ff97c0c4c36fdd1a':
  Import translations. DO NOT MERGE
 2013-12-04 13:07:57 -08:00
Geoff Mendal
82af5d8931 am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit '6d25c934dcdf7a098d4e9f96cb206789dfd4afb7':
  Import translations. DO NOT MERGE
 2013-12-04 13:01:30 -08:00
Geoff Mendal
6d25c934dc Import translations. DO NOT MERGE 
Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
Auto-generated-cl: translation import
 2013-12-04 11:35:25 -08:00
Lorenzo Colitti
13d9dfb495 am 86570409: am 453a5233: Merge "Minor changes to LinkAddress." 
* commit '86570409a28ff359acbf56cc11bc1ad4d5f57630':
  Minor changes to LinkAddress.
 2013-12-04 01:29:35 +00:00
Lorenzo Colitti
86570409a2 am 453a5233: Merge "Minor changes to LinkAddress." 
* commit '453a5233086b216f2a95d0879954a2af39279095':
  Minor changes to LinkAddress.
 2013-12-03 17:26:06 -08:00
Lorenzo Colitti
453a523308 Merge "Minor changes to LinkAddress." 2013-12-04 01:21:07 +00:00
Craig Mautner
3ffc6d522a Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I6e3ce13f71593ee68e457f51ff23ae76ad04d4bc
 2013-12-03 16:57:42 -08:00
Amith Yamasani
3b84092f87 DO NOT MERGE : Move some system services to their own sub package. 
(Cherry pick from master)

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: I33e48d070f38186819d3a1d7a4dc3984b75a9eda
 2013-12-03 09:58:18 -08:00
Dirk Dougherty
efbc4aeb4a am 31c041a5: am 1c64e2f4: Add samples TOC generated from browsable sources. 
* commit '31c041a58315eca907192411905273e88dbc2f8f':
  Add samples TOC generated from browsable sources.
 2013-12-03 17:53:12 +00:00
Dirk Dougherty
31c041a583 am 1c64e2f4: Add samples TOC generated from browsable sources. 
* commit '1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d':
  Add samples TOC generated from browsable sources.
 2013-12-03 09:51:05 -08:00
Lorenzo Colitti
e1ad1849f3 Minor changes to LinkAddress. 
1. Simplify the parceling code. Since the InetAddress inside a
   LinkAddress can never be null, we don't need to special-case
   the case where it is.
2. Add / update method documentation.
3. Write a unit test.

Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
 2013-12-03 19:46:36 +09:00
Dirk Dougherty
1c64e2f429 Add samples TOC generated from browsable sources. 
Change-Id: I760eceb3a315d5fd1b65ecdcd014a9507990a26b
 2013-12-03 00:14:39 +00:00
Mathieu Chartier
dae9f5a515 am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 
* commit 'f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79':
  Add dalvik.vm.gctype to enable switching between different GCs.
 2013-12-03 00:05:32 +00:00
Mathieu Chartier
f3a2430a2b am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 
* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
  Add dalvik.vm.gctype to enable switching between different GCs.
 2013-12-02 16:00:49 -08:00
Mathieu Chartier
738fa2f64e Merge "Add dalvik.vm.gctype to enable switching between different GCs." 2013-12-02 23:53:10 +00:00
Mathieu Chartier
7e4fdec6f0 Add dalvik.vm.gctype to enable switching between different GCs. 
The option passes the specified GC type into the Xgc runtime
option.

Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.

Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
 2013-12-02 15:50:18 -08:00
Scott Main
5c4c68da54 am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit 'd400e6146b18b12a75d750654b8a118105fd1834':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 22:29:33 +00:00
Scott Main
d400e6146b am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit '7511d659a2a3815cc6894cd71ebed0a27e341430':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 14:25:52 -08:00
Scott Main
7511d659a2 am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit '2dd715ed45b9000eab81b0972d0585294d7f9ddd':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 22:20:22 +00:00