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

118089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:31:02 -08:00
Wink Saville
ad06883730 am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit '76d5cdd820b5d81af8de73180c272d7f8a01caae':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:28:58 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
992065938a am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
c156021deb am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712
 2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e Merge "Fix a bug introduced in change 73712" 2014-01-08 12:47:31 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 04:02:05 -08:00
Narayan Kamath
2842bd021c am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'de8c3cf13b0fc0655cf49934658e652b441ee019':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 03:59:46 -08:00
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
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
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
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
Dave Platt
e966e5774a am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 11:49:49 -08:00
Narayan Kamath
0dce19caf8 am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit '79ceb53ae5b867a954476e3f6499f89664fbc669':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 05:01:13 -08:00
Narayan Kamath
23ebc24eee am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit '08467c5727c04c1fef40ff1e361628944275ef28':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 05:01:08 -08:00
Narayan Kamath
e7d7908c28 am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 05:01:03 -08:00
Narayan Kamath
bfbe585ed4 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 05:00:58 -08:00
Narayan Kamath
568cde557a am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '80cff94478a39914012df816179ea57c53040903':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 05:00:53 -08:00
Narayan Kamath
79ceb53ae5 am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit 'c58abeeae34c77559c00c7d967c77443469abeef':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 04:58:23 -08:00
Narayan Kamath
08467c5727 am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit '9bc6acf27ac446b7e18a51a926caafd99cf34713':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 04:54:46 -08:00
Narayan Kamath
02baba2554 am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '670327544184dbd6274de9127ceaf20dfd5801b4':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 04:54:42 -08:00
Narayan Kamath
c0c92f206e am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit '357ea90515025d806c6360ef846bf6f84b45a64e':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 04:54:35 -08:00
Narayan Kamath
c58abeeae3 Merge "AArch64: Use long for pointers in MTP classes" 2014-01-07 12:54:11 +00:00
Ashok Bhat
e2e59326f1 AArch64: Use long for pointers in MTP classes 
For storing pointers, long is used in MTP 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: I67805547251722e7b77611d47d0bb632a64d3e6d
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-07 12:52:57 +00:00
Narayan Kamath
80cff94478 am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '74675f29133ff36dccc95387392bf3654dc94e15':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 04:50:56 -08:00
Narayan Kamath
9bc6acf27a Merge "AArch64: Use long for pointers in VideoEditor classes" 2014-01-07 12:50:07 +00:00
Ashok Bhat
44ba5c1b4e AArch64: Use long for pointers in VideoEditor classes 
For storing pointers, long is used in VideoEditor
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: Ifff3a28f2ab6774ee89d31770ad63451c8726431
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-07 12:49:41 +00:00