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

121792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
 2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:58:17 -08:00
Narayan Kamath
cbf339f6e4 am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'ab169215fb135f590f0960ab89f5199dd7303a33':
  AArch64: Use long for pointers in services
 2014-01-08 03:58:13 -08:00
Narayan Kamath
b5558817c7 am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '002ae75b829730047240ab20a044a00570eb71d2':
  AArch64: Use long for pointers
 2014-01-08 03:56:00 -08:00
Narayan Kamath
53acc7ae00 am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit 'f5598210f067acf340487ba2fe55b00e43be1d9d':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:55:56 -08:00
Narayan Kamath
ab169215fb am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'f210044fb8e2f6c056e5314702353d7b97d64978':
  AArch64: Use long for pointers in services
 2014-01-08 03:55:52 -08:00
Narayan Kamath
de8c3cf13b Merge "AArch64: Use long for pointers in App/Backup" 2014-01-08 11:54:29 +00:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup 
For storing pointers, long is used, as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:54:01 +00:00
Narayan Kamath
002ae75b82 Merge "AArch64: Use long for pointers" 2014-01-08 11:53:51 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers 
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:53:21 +00:00
Narayan Kamath
f5598210f0 Merge "AArch64: Use long for pointers in hardware classes" 2014-01-08 11:53:12 +00:00
Narayan Kamath
f210044fb8 Merge "AArch64: Use long for pointers in services" 2014-01-08 11:53:00 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes 
For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 10:17:21 +00:00
Ashok Bhat
7e2a9dcf1a AArch64: Use long for pointers in services 
For storing pointers, long is used, as native pointers
can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-08 10:06:07 +00:00
Vinit Deshpande
d9feaf4971 Merge "Revert "Move Wifi services to a new git project"" 2014-01-08 02:41:16 +00:00
Vinit Deshpande
f1182c9c1a Revert "Move Wifi services to a new git project" 
This reverts commit 4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3.

Change-Id: I6269a683e842a5d1cfdafea892be86972ae11c40
 2014-01-08 02:38:31 +00:00
Vinit Deshapnde
ed8ed0bc81 Merge "Move Wifi services to a new git project" 2014-01-08 02:27:25 +00:00
RoboErik
fb290df3c9 b/12068020 Make kb layouts only unique to vendor/product 
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
 2014-01-07 17:37:24 -08:00
Alan Viverette
24927f2798 Allow Views to specify a theme override 
During inflation, any view with a theme attribute will wrap its context
with a theme override. Child views inflated during recursion will inherit
the wrapped context.

BUG: 12178430
Change-Id: Icba019d1c4f4f7e1a66d19dd402038defb42b7a6
 2014-01-07 17:28:48 -08:00
Robert Greenwalt
bc6c07f056 am 080d1bdd: am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-08 00:53:01 +00:00
Robert Greenwalt
080d1bdd7f am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-08 00:50:16 +00:00
Robert Greenwalt
132a55375e am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '400e6b705f860fe70264a8b2d73c82772d734ad7':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-08 00:47:37 +00:00
Robert Greenwalt
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-07 16:44:30 -08:00
Robert Greenwalt
cbf5e8758f am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '517e9b11d53609d59c60d22dc085e7f9fd442248':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-07 16:41:16 -08:00
Robert Greenwalt
517e9b11d5 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 2014-01-08 00:38:29 +00:00
Glenn Kasten
9d1ed347d3 Merge "Remove I/O handle from get/setParameters parameter list" 2014-01-08 00:36:46 +00:00
Christopher Tate
498dbb88eb Merge "Don't just log this warning; record the situation for posterity" 2014-01-08 00:11:15 +00:00
Christopher Tate
08af733f87 Don't just log this warning; record the situation for posterity 
When a previously 3rd-party permission declaration is superseded
by a new system-owned declaration, don't just log; leave a persistent
record of the fact for post-hoc recognition of what happened even
after reboots.

Change-Id: I816a5003f8f8ef2dfbdbfa36316c4bae5005dfbf
 2014-01-07 16:05:22 -08:00
Alan Viverette
e2802755b1 Merge "Add support for specifying Drawable color filter in XML" 2014-01-07 23:53:47 +00:00
John Reck
ed20ebbde5 Merge "EGL migration to native" 2014-01-07 23:39:40 +00:00
John Reck
23b797ab51 EGL migration to native 
Move EGL state management to native side for RemoteGLRenderer

Change-Id: I12b0fed70246564d4caebf87374e8bbca655c572
 2014-01-07 14:53:55 -08:00
Ian Rogers
6c6a11648f am 878df18c: am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '878df18c48fa5f0282cee5ded80238f64826cf84':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:47:37 +00:00
Ian Rogers
878df18c48 am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:45:07 +00:00
Ian Rogers
8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:41:34 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:38:44 -08:00
Ian Rogers
c2b50c10f0 am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'f11dee797177760f089e757d91ed6bce32043750':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:36:29 -08:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Adam Lesinski
dfc73e9c24 am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 
* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
  Move SystemService code to frameworks/base/core
 2014-01-07 20:58:16 +00:00
Adam Lesinski
66e9b1e117 Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 2014-01-07 20:53:20 +00:00
Alan Viverette
58a8a678bd Merge "Revert "Allow Views to specify a theme override"" 2014-01-07 20:30:01 +00:00
Alan Viverette
eb14ccf020 Revert "Allow Views to specify a theme override" 
Inheriting the parent view's Context breaks RemoteView inflation.

This reverts commit dd9233253b88d86473403d5b63c72e223b5e40bd.

Change-Id: I1c9a940a31169cd42b7356ad58548597a2efbb24
 2014-01-07 20:28:56 +00:00
Dave Platt
edbe35357c am 5dd0be29: am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '5dd0be293694706e016d6ff431668de2d318f3aa':
  Fix descriptor leak after accepting connections
 2014-01-07 20:02:02 +00:00
Dave Platt
10c3f81cbb am d5d0ab5b: am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit 'd5d0ab5ba9203804dea82be9bd13770428455e5f':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 20:01:55 +00:00
Dave Platt
5dd0be2936 am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
  Fix descriptor leak after accepting connections
 2014-01-07 19:59:21 +00:00
Dave Platt
d5d0ab5ba9 am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit '1b5bc6f8f96fc30b651679411a4da00d3fbebaa7':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 19:59:11 +00:00
Dave Platt
07290a7be3 am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
  Fix descriptor leak after accepting connections
 2014-01-07 19:55:47 +00:00
Dave Platt
1b5bc6f8f9 am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit 'bd9acc2218fcf3cd6605554a45db2251753ddd7b':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 19:55:43 +00:00
Dave Platt
3bbf7e6aa5 am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
  Fix descriptor leak after accepting connections
 2014-01-07 11:53:12 -08:00
Dave Platt
bd9acc2218 am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit 'e966e5774ad8d478bc89b541bcac3740fe267d18':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 11:53:07 -08:00
Dave Platt
62bac75d67 am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
  Fix descriptor leak after accepting connections
 2014-01-07 11:49:54 -08:00