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

29352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
40eade14bb Merge from open-source master 
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
 2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
077bc4ac01 Merge from open-source master 
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
 2010-12-02 07:54:57 -08:00
Jean-Baptiste Queru
e1de3f390e Merge "Fix crash by "adb shell pm list permissions -f|-s"" 2010-12-01 09:47:14 -08:00
Jean-Baptiste Queru
6cbca10893 Merge "Fix HTTP redirect missing statuscode 303 and 307" 2010-12-01 08:25:12 -08:00
Ali Utku Selen
1c3274ca12 Fix crash by "adb shell pm list permissions -f|-s" 
pm command makes the assumption that every permission should
contain android:description and android:label attributes while
they are not mandatory. If a permission does not contain these
two attributes, we get "android.content.res.
Resources$NotFoundException: String resource ID #0x0"
followed by a NPE when using -f or -s options.

With the following change, users will get "null" in output for
respective fields.

Change-Id: I4e7f407592fa071abdab1d979775f46ec27dc9d2
 2010-11-30 16:22:56 +01:00
Takeshi Aimi
f05913aaa0 DRM Framework bug fixes. 
- Make sure to clean-up obsolete listeners.
- Close cursor after using it.
- Add virtual destructor to the base class of OnInfoListener.

Changes are made by SEMC and Sony.

Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
 2010-11-30 16:27:42 +09:00
Per Osbäck
43df1334a8 Fix HTTP redirect missing statuscode 303 and 307 
Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
 2010-11-29 15:59:12 +01:00
Trevor Johns
d3f19b86b0 am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
  Revert "Disabling AccessibilityService sample from build system."
 2010-11-24 16:23:47 -08:00
Trevor Johns
210e9c4a8b Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 2010-11-24 16:21:16 -08:00
Trevor Johns
e66593b47c Revert "Disabling AccessibilityService sample from build system." 
This re-enables the AccessibilityService sample.

This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
 2010-11-24 16:03:21 -08:00
Xia Wang
a23fff3351 am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
  Add Wi-Fi tests for static IP. DO NOT MERGE
 2010-11-24 13:29:56 -08:00
Xia Wang
c1c04ad047 Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 2010-11-24 13:27:53 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties 
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
 2010-11-24 11:24:33 -08:00
Jean-Baptiste Queru
9df7f31359 am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error" 
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
  frameworks/base: Destroy the overlay even if there is an error
 2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
f0f6c54b13 Merge "frameworks/base: Destroy the overlay even if there is an error" 2010-11-23 11:02:09 -08:00
Gloria Wang
3e18dfab34 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts" 
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
 2010-11-22 21:26:13 -08:00
Gloria Wang
24a90c2674 am d9334934: Merge "Update of DRM Framework." 
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
  Update of DRM Framework.
 2010-11-22 21:25:56 -08:00
Gloria Wang
4da48ec883 Merge "Notify the playback status to DRM agents before the playback starts" 2010-11-22 21:15:07 -08:00
Gloria Wang
d93349342a Merge "Update of DRM Framework." 2010-11-22 21:14:09 -08:00
Xia Wang
739d0aed02 Add Wi-Fi tests for static IP. DO NOT MERGE 
- Add support in parser to parse static IP settings
- Add test for static IP configuration

Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
 2010-11-22 19:10:01 -08:00
Jean-Baptiste Queru
8484e57f30 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp 
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
 2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
e4ae7fc3eb Merge "Enabling cell broadcast (SMS-CB) support in the platform." 2010-11-22 15:59:04 -08:00
Xia Wang
6bdd69370f am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread 
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
  Add Wifi Tethering stress test
 2010-11-22 14:46:33 -08:00
Xia Wang
5df8c15587 Merge "Add Wifi Tethering stress test" into gingerbread 2010-11-22 14:44:49 -08:00
Naomi Luis
637e3fd523 frameworks/base: Destroy the overlay even if there is an error 
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.

Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
 2010-11-22 14:03:18 -08:00
Scott Main
4f3c40cc4d am 8fac7c2e: change sdk version variable to 2.3 (for docs) 
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
  change sdk version variable to 2.3 (for docs)
 2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
c8454a851f am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" 
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
  SearchDialog: Fix for NullpointerException while using Suggestions in Browser
 2010-11-22 13:44:56 -08:00
Jean-Baptiste Queru
b2b0db2d5c Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" 2010-11-22 13:40:29 -08:00
Scott Main
8fac7c2edc change sdk version variable to 2.3 (for docs) 
Change-Id: I76f5c69fab08913543c4f3d1ab000f7c4b6c9574
 2010-11-22 13:36:39 -08:00
Xia Wang
6026d52710 Add Wifi Tethering stress test 
Stress Wifi driver loading and unloading by enable/disable access point
mode.

Change-Id: Ie31266d2b9665cb304473f1c14c83bc57e9920f2
 2010-11-22 12:00:31 -08:00
Gloria Wang
95dbffb241 Notify the playback status to DRM agents before the playback starts 
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
 2010-11-22 11:03:51 -08:00
Deepika Sai Amuri
b00d41acd6 SearchDialog: Fix for NullpointerException while using Suggestions in 
Browser

Change-Id: Ic208ae51e4f7678363ea6d7de9db97707713bf6d
 2010-11-22 01:31:35 -08:00
Dirk Dougherty
e489d48f7c am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread 
* commit '805bddc123c1fc56be333d6ff365f168d4bc2b08':
  doc change: Docs for SDK Tools r8, ADT 8
 2010-11-19 19:04:56 -08:00
Dirk Dougherty
805bddc123 Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread 2010-11-19 19:03:03 -08:00
Wu-cheng Li
fb6f4505ba am 589e8381: Merge "Improve camera documentation." into gingerbread 
* commit '589e838116b0dffa696fa39336d0588124877f98':
  Improve camera documentation.
 2010-11-19 18:17:24 -08:00
Wu-cheng Li
589e838116 Merge "Improve camera documentation." into gingerbread 2010-11-19 18:14:43 -08:00
Mathias Agopian
d3b5510b85 am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread 
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
  Fix SensorManager.getOrientation() documentation.
 2010-11-19 17:20:14 -08:00
Mathias Agopian
927e741000 Merge "Fix SensorManager.getOrientation() documentation." into gingerbread 2010-11-19 17:18:21 -08:00
Scott Main
55ff5708bb am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread 
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
  docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
 2010-11-19 16:51:57 -08:00
Scott Main
828b681666 Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread 2010-11-19 16:48:50 -08:00
Mathias Agopian
f71384cd61 Fix SensorManager.getOrientation() documentation. 
This function doesn't use the same reference coordinate system used
for the rotation matrix, unlike what the documentation previously
stated.

Change-Id: I38abeb74540d33b67f72993b54d7a00a73588dde
 2010-11-19 16:25:11 -08:00
Jean-Baptiste Queru
716f60ce60 resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp 
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
 2010-11-19 16:21:31 -08:00
Jean-Baptiste Queru
e2ec61b23b Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files." 2010-11-19 15:50:29 -08:00
Jean-Baptiste Queru
7b76ed693e am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver." 
* commit 'e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
  Added noop unregisterReceiver to complement existing noop registerReceiver.
 2010-11-19 15:43:28 -08:00
Jean-Baptiste Queru
e3bef7c48d Merge "Added noop unregisterReceiver to complement existing noop registerReceiver." 2010-11-19 15:31:30 -08:00
Dirk Dougherty
00f502a38c am 0e29064d: Merge "Doc change: update media formats table." into gingerbread 
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.
 2010-11-19 10:53:20 -08:00
Dirk Dougherty
0e29064d1c Merge "Doc change: update media formats table." into gingerbread 2010-11-19 10:47:10 -08:00
Brad Fitzpatrick
096c4c448d am 251384a7: Merge "Improve performance when getting styled string." 
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
  Improve performance when getting styled string.
 2010-11-19 10:25:09 -08:00