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

30878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:53:54 -07:00
Xavier Ducrohet
e0947693c9 am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:53:51 -07:00
Xavier Ducrohet
4753498d5c Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:53:06 -07:00
Xavier Ducrohet
9918ffb07f Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:52:59 -07:00
Xavier Ducrohet
54146a634e Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 2011-06-28 18:52:43 -07:00
mike wakerly
af08ddbc42 am 2f9ad8b4: Add intent actions for new firmware events. 
* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
  Add intent actions for new firmware events.
 2011-06-28 17:19:05 -07:00
mike wakerly
2f9ad8b499 Add intent actions for new firmware events. 
Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
 2011-06-27 18:46:31 -07:00
Jean-Baptiste Queru
99c070d8eb am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 11:33:46 -07:00
Jean-Baptiste Queru
7595e84d3a am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility
 2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
4fea5373d3 Merge "Add WEBP to the list of Image formats that support Compression." 2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
f458d5fdb8 Merge "Tweak for forward-compatibility" 2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
0fe0e7a4cb Tweak for forward-compatibility 
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
 2011-06-24 10:49:18 -07:00
Vikas Arora
2305ac9e4a Add WEBP to the list of Image formats that support Compression. 
Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
 2011-06-23 13:11:13 +05:30
Raphael Moll
2b5f2d0155 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Raphael Moll
e2b41b0d5c Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Jaikumar Ganesh
9e5d0de9a3 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-21 13:24:46 -07:00
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog. 
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
 2011-06-21 09:27:12 -07:00
Nick Pelly
6f1a8edcc0 am 17523abb: NFC Adapter Extras API update. 
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
  NFC Adapter Extras API update.
 2011-06-20 15:54:07 -07:00
Conley Owens
c1b62e3ba9 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
  Check if we are in daylight time when calculating timezone
 2011-06-20 13:04:45 -07:00
Conley Owens
bf5adfa5e5 Merge "Check if we are in daylight time when calculating timezone" 2011-06-20 11:01:41 -07:00
Jean-Baptiste Queru
ff3ead5072 am e3b05d09: Merge "Tweaks for forward-compatibility" 
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
 2011-06-20 09:05:07 -07:00
Jean-Baptiste Queru
e3b05d0916 Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility 
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
 2011-06-18 09:42:04 -07:00
Raphael Moll
865c3bef54 Laoutlib_creator: keep original of delegate methods. 
For specific methods, Layoublib_create can rewrite the implementation
of a method to invoke a delegate instead of the original code. This
allows layoutlib to implement native code or override existing behavior.

This patch also 'saves' the original implementation of a rewritten
method so that the delegate can access the original implementation
as needed. Obviously this is only done for non-native methods.

Given a non-native SomeClass.MethodName, we generate 2 methods:
- A copy of the original method named "SomeClass.MethodName_original".
  The content is the original method as-is from the reader.
- A brand new implementation of SomeClass.MethodName which calls to a
  non-existing method named "SomeClass_delegate.MethodName".
  The implementation of this 'delegate' method is done in layoutlib_brigde.

Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
 2011-06-17 19:07:13 -07:00
Nick Pelly
17523abb45 NFC Adapter Extras API update. 
Remove
o registerTearDownApdus()
o deregisterTearDownApdus()
They were already NO-OPS, and don't work in the general case.

Add
o authenticate(byte[] token)
This future proofs us for a more flexible access control scheme.

Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
 2011-06-17 14:51:40 -07:00
Xavier Ducrohet
d6465e10c2 CherryPick 06942bc4 from hc-mr1. do not merge. 
Layoutlib - use the new getParser callback when possible.

Change-Id: I72b867aa573fcc07d610f139da3c90b1b654633c
 2011-06-16 18:26:25 -07:00
Xavier Ducrohet
6b62c82848 CherryPick 988eeeb5 from hc-mr1. do not merge. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
 2011-06-16 18:26:24 -07:00
Mathias Agopian
ec15afca08 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-06-16 18:26:14 -07:00
Maarten Hooft
42781a11ce am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
 2011-06-16 15:48:55 -07:00
Maarten Hooft
d76baeb4d8 Merge "Import revised Croatian translations." into gingerbread 2011-06-16 15:41:20 -07:00
Irfan Sheriff
a464430762 am df1734e3: Fix lease duration handling 
* commit 'df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
  Fix lease duration handling
 2011-06-15 16:29:02 -07:00
Mathias Agopian
5137711109 am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:13:04 -07:00
Irfan Sheriff
df1734e3f5 Fix lease duration handling 
We need to convert lease duration from int to long before
converting into milliseconds

Also add basic sanity check

Bug: 4561231
Change-Id: I9bcafaa798a04c8de3f2c1897dc5b3c4ae245672
 2011-06-15 13:51:55 -07:00
Eric Fischer
5f0c1d2ad8 Import revised Croatian translations. 
Change-Id: I9fb9bf6796d19e4b419381a0dd398f53bf2e879f
 2011-06-15 12:10:52 -07:00
Marco Nelissen
d8f9a83cab resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
Change-Id: I169c415bf998b9935ab36812511573db05717b91
 2011-06-15 08:58:38 -07:00
Mathias Agopian
afffa8fa9f fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
 2011-06-13 13:58:34 -07:00
Dan Morrill
653fd9cfac am 8688d470: Moving flag to a member field instead of a stack variable. 
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
  Moving flag to a member field instead of a stack variable.
 2011-06-11 09:52:50 -07:00
Soojung Shin
d027329cd6 Ignore duplicate WAP push PDU source/destination port if configured 
Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
     -SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-06-10 13:48:36 -07:00
Dan Morrill
8688d47081 Moving flag to a member field instead of a stack variable. 
Change-Id: I2b281ec4d424f2c4286fb0bc8db263e3893ad898
 2011-06-10 10:44:01 -07:00
Dan Morrill
c2e1e32908 am a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread 
* commit 'a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
 2011-06-09 14:52:40 -07:00
Dan Morrill
a1a107b8cb Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread 2011-06-09 14:43:58 -07:00
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds 
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
 2011-06-09 09:39:52 -07:00
Dan Morrill
e33fc82cc9 Adding a new config value used to tell StatusBarPolicy to always use CDMA 
signal strength value even when on EVDO. Default is off, but devices that need
to can override it.

Change-Id: I675af3f3ecfe34a72954ae8241965b0a882edbb8
 2011-06-08 21:58:06 -07:00
Mathias Agopian
17574b9a0a am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 19:56:06 -07:00
Mathias Agopian
19974eccdb Fix a leak in RefBase (DO NOT MERGE) 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
 2011-06-08 16:13:39 -07:00