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

6620 Commits

Author SHA1 Message Date
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal 
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
 2009-03-29 08:55:27 -07:00
Doug Kwan
d94755bf33 AI 143430: Remove broken and unused code. 
This CL removes RoManager::getDevicePrivateKey() and its declaration.
  The method is not used anywhere and it contains bad code that returns
  reference to a local object.
  This is tested by building the master tree and running the framework
  testsuite.  No error was found in testsuite.
  BUG=1737538

Automated import of CL 143430
 2009-03-28 21:53:49 -07:00
Dave Sparks
b8c055e7cb AI 143267: am: CL 143127 Media recorder service requires android.permission.CAMERA to record video 
Original author: davidsparks
  Merged from: //branches/cupcake/...

Automated import of CL 143267
 2009-03-27 20:28:22 -07:00
Dave Sparks
17612fcdcb AI 143396: am: CL 143267 am: CL 143127 Media recorder service requires android.permission.CAMERA to record video 
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143396
 2009-03-27 19:56:11 -07:00
Mike Lockwood
64a5458e76 AI 143360: am: CL 143209 am: CL 143001 Remove sdutils from user build to save 12K on /system partition. 
BUG=1739507
  Original author: lockwood
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143360
 2009-03-27 19:14:26 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -07:00
Mike Lockwood
3870a95435 AI 143209: am: CL 143001 Remove sdutils from user build to save 12K on /system partition. 
BUG=1739507
  Original author: lockwood
  Merged from: //branches/cupcake/...

Automated import of CL 143209
 2009-03-27 18:11:25 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake' 
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
 2009-03-27 15:38:40 -07:00
Dave Sparks
ba9844ee12 AI 143127: Media recorder service requires android.permission.CAMERA to record video 
BUG=1742392

Automated import of CL 143127
 2009-03-27 12:57:40 -07:00
Mike Lockwood
d4d70d95ea Automated import from //branches/cupcake/...@143001,143001 2009-03-26 15:59:52 -07:00
Jean-Michel Trivi
26a857e181 Automated import from //branches/master/...@142377,142377 2009-03-24 22:43:38 -07:00
Jean-Michel Trivi
3d78f9ab08 Automated import from //branches/donutburger/...@142376,142376 2009-03-24 22:36:44 -07:00
Yu Shan Emily Lau
3e7b3c0f27 Automated import from //branches/master/...@142150,142150 2009-03-24 22:20:13 -07:00
Yu Shan Emily Lau
fd92c57439 Automated import from //branches/donutburger/...@142149,142149 2009-03-24 21:31:10 -07:00
Eric Laurent
ba5aba22ab Automated import from //branches/master/...@142066,142066 2009-03-24 21:29:21 -07:00
Eric Laurent
272beb6383 Automated import from //branches/donutburger/...@142065,142065 2009-03-24 21:23:54 -07:00
Andreas Huber
effd8d55b2 Automated import from //branches/master/...@141712,141712 2009-03-24 20:48:51 -07:00
Andreas Huber
e25b51baf4 Automated import from //branches/donutburger/...@141711,141711 2009-03-24 20:47:19 -07:00
Dave Sparks
821ef406f8 Automated import from //branches/master/...@141595,141595 2009-03-24 20:36:20 -07:00
Dave Sparks
6ee2e78e1c Automated import from //branches/donutburger/...@141593,141593 2009-03-24 20:35:44 -07:00
Niko Catania
4a0029f95d Automated import from //branches/donutburger/...@141213,141213 2009-03-24 19:51:09 -07:00
Niko Catania
a06f6e328d Automated import from //branches/master/...@141214,141214 2009-03-24 19:50:50 -07:00
Jean-Michel Trivi
78c1314731 Automated import from //branches/donutburger/...@141200,141200 2009-03-24 19:48:58 -07:00
Jean-Michel Trivi
108762b6e0 Automated import from //branches/master/...@141201,141201 2009-03-24 19:48:32 -07:00
Jean-Michel Trivi
cb80d9fd97 Automated import from //branches/cupcake/...@142374,142374 2009-03-24 19:33:18 -07:00
Yu Shan Emily Lau
6887e54e5c Automated import from //branches/cupcake/...@142148,142148 2009-03-24 19:04:51 -07:00
Eric Laurent
e0366d0b2f Automated import from //branches/cupcake/...@142064,142064 2009-03-24 18:56:19 -07:00
Jean-Michel Trivi
e89554b02d Automated import from //branches/master/...@140869,140869 2009-03-24 18:46:20 -07:00
Jean-Michel Trivi
d3ca04da8a Automated import from //branches/donutburger/...@140867,140867 2009-03-24 18:46:07 -07:00
Jason Sams
ebb020aebc Automated import from //branches/master/...@140868,140868 2009-03-24 18:45:22 -07:00
Jason Sams
4610f7d1f9 Automated import from //branches/donutburger/...@140866,140866 2009-03-24 18:45:20 -07:00
Dianne Hackborn
08905cc336 Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:53 -07:00
Dianne Hackborn
678764730b Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:48 -07:00
Niko Catania
d01721d5ca Automated import from //branches/donutburger/...@140811,140811 2009-03-24 18:35:10 -07:00
Niko Catania
70322464af Automated import from //branches/master/...@140812,140812 2009-03-24 18:35:07 -07:00
Niko Catania
1a9f7399bb Automated import from //branches/donutburger/...@140800,140800 2009-03-24 18:32:47 -07:00
Niko Catania
5f44349c12 Automated import from //branches/master/...@140804,140804 2009-03-24 18:32:41 -07:00
Andreas Huber
4873375b2a Automated import from //branches/cupcake/...@141708,141708 2009-03-24 18:14:23 -07:00
Jean-Michel Trivi
e025d2d746 Automated import from //branches/master/...@140665,140665 2009-03-24 18:11:52 -07:00
Jean-Michel Trivi
4a5c1a7e84 Automated import from //branches/donutburger/...@140663,140663 2009-03-24 18:11:07 -07:00
Jean-Michel Trivi
a5e5643d5d Automated import from //branches/master/...@140567,140567 2009-03-24 17:57:26 -07:00
Dave Sparks
cb9a44ed08 Automated import from //branches/cupcake/...@141591,141591 2009-03-24 17:57:12 -07:00
Jean-Michel Trivi
470f71f4a4 Automated import from //branches/donutburger/...@140566,140566 2009-03-24 17:55:14 -07:00
Jason Parekh
3ff637187a Automated import from //branches/master/...@140509,140509 2009-03-24 17:50:29 -07:00
Jason Parekh
b109615ebe Automated import from //branches/donutburger/...@140507,140507 2009-03-24 17:48:25 -07:00
Jean-Baptiste Queru
680f8c77d5 Deal better with situations where OpenCORE is disabled. 2009-03-23 12:00:23 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge 
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
 2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00