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

213 Commits

Author SHA1 Message Date
Nick Pelly
d197f59ec9 Fix build. 
I removed these by mistake, and incremental build failed to pick the failure.

Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
 2010-10-12 19:21:07 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2. 
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-12 18:37:26 -07:00
Nick Pelly
038cabe024 NFC integration 
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-09-28 22:36:27 -07:00
Jesse Wilson
a145956551 Add optional tags to frameworks/base ext. 
Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
 2010-09-16 17:50:43 -07:00
Joe Onorato
b9f03d51c2 DO NOT MERGE - Doclava warnings are now errors. 
Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
 2010-09-16 14:30:16 -04:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -07:00
Joe Onorato
71f7f67230 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. 
Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
 2010-09-16 12:03:41 -04:00
Dirk Dougherty
e71396cf47 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:39:59 -07:00
Dirk Dougherty
4b4af990af Doc change: update ADT 0.9.8 checksum and size. 
Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
 2010-09-14 09:17:33 -07:00
Joe Onorato
e94f6db177 Make @deprecated without a comment an error DO NOT MERGE 
(do not merge because in master, this error has a different code 114 instead of 14)

Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
 2010-09-10 15:02:06 -04:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
Dirk Dougherty
022171be9d Doc change: Add notes for SDK Tools r7 and ADT 0.9.8. 
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
 2010-09-08 15:59:56 -07:00
Joe Onorato
47471175c9 Can't have two rules building the stubs and public.xml! 
Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
 2010-08-31 15:11:11 -07:00
Joe Onorato
77881293ad DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments. 
Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
 2010-08-31 12:00:03 -07:00
Bill Napier
e0dacf93b1 Add support for generated documentation as part of the SDK docs. 
This can be done by adding the list of files to include to the
ALL_GENERATED_DOCS variable, and then making sure to put your generated output
files under $(OUT_DOCS)/gen.

Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
 2010-08-24 22:18:54 -07:00
Trevor Johns
bb75aa9065 am ca9d51b1: Disabling AccessibilityService sample from build system. 
Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread

* commit 'ca9d51b15074163521b140dce431cc3a10cb56fe':
  Disabling AccessibilityService sample from build system.
 2010-08-20 18:42:38 -07:00
Trevor Johns
ca9d51b150 Disabling AccessibilityService sample from build system. 
This is necessary for an upcoming doc push. I'll revert this change after the
doc push is complete.

Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
 2010-08-20 17:13:02 -07:00
Kenny Root
be857d4284 Reorganize MountService IPC 
Remove auto-generated AIDL files and replace them with manually edited
.java and .cpp/.h files so that binder calls can be made from either
Java or C++.

Update the makefiles to not attempt to generate the AIDL files and also
remove the old auto-generated .java files.

Put all the storage-related C++ things in libstorage so that we don't
pollute other libraries.

Change-Id: I82d1631295452709f12ff1270f36c3100e652806
 2010-08-20 13:17:12 -07:00
Roman Nurik
e6bfceeb10 am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo 
Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread

* commit '3b70e159a8168c1154d31d7b0552bb3b0c099334':
  Adding a sample accessibility service -make
 2010-08-17 10:45:30 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService 
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
 2010-08-11 11:20:53 -07:00
Svetoslav Ganov
0581d4a197 Adding a sample accessibility service -make 
Change-Id: I5bdd57e022b9907f7745046d8818801dbc3929a8
 2010-08-10 21:39:56 -07:00
Chung-yih Wang
2d94231ef9 Add SIP service into system server. 
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
 2010-08-06 08:40:50 +08:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread 
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
 2010-08-04 23:47:38 -07:00
Mathias Agopian
1bf797857e new SensorService 
remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.

Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
 2010-07-19 17:57:29 -07:00
Joe Onorato
80a60ba85b Clean up some style in the makefiles. 
Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
 2010-07-14 19:58:30 -07:00
Dianne Hackborn
fef42db925 Add sample code. 
Change-Id: I8f598dcbccbb0c43cedc1e1d02f6e3a46d6ebc67
 2010-06-04 13:38:43 -07:00
Joe Onorato
0cbda99f87 The status bar draws its icons now. 2010-06-02 14:48:41 -07:00
Joe Onorato
90233a1ee5 Add IStatusBar 
Change-Id: Ie73d665085d5ce7358c285bf332ef1dc96005d0f
 2010-06-02 14:48:40 -07:00
Joe Onorato
25f95f9200 Rename IStatusBar to IStatusBarService. 
Change-Id: Icfec2a830f037b21f6afaa796bf49da610567e7b
 2010-06-02 14:48:40 -07:00
Joe Onorato
2314aab506 First pass at splitting the status bar for the different devices. 
Change-Id: I2f568df92f88dfe8de18d24dd004239f52761aa6
 2010-06-02 14:48:39 -07:00
Guang Zhu
864feb8dfa disable emma instrumentation for framework, ext and services (DO NOT MERGE) 
When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.

Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
 2010-05-18 16:02:28 -07:00
Joe Onorato
626db9101e Store the list of source directories for the SDK. 
Change-Id: I3e8425c8eb7c808b60ec764ff81bcbb7aec9684c
 2010-05-17 18:25:58 -07:00
Mike Lockwood
3e9e9696f1 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd Resurrect flashlight support in obsolete IHardwareService Binder API. 
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.

Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-17 17:47:20 -04:00
Dirk Dougherty
c6b7a2d704 am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages. 
Merge commit 'd1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp

* commit 'd1e9d590941303c004459f3d798b26f1bf091535':
  Doc change: add sizes/sums for sdk/ndk/adt packages.
 2010-05-14 18:42:11 -07:00
Dirk Dougherty
d1e9d59094 Doc change: add sizes/sums for sdk/ndk/adt packages. 
Change-Id: I9385c5b90a8f366764337adf4221fba4d7448568
 2010-05-14 18:14:42 -07:00
Dirk Dougherty
052e2102df am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp

* commit '0d1b0814be24f501395bf175fba8691117f782d5':
  Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
 2010-05-12 07:50:57 -07:00
Dirk Dougherty
0d1b0814be Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
 2010-05-11 20:07:32 -07:00
Dirk Dougherty
769612e160 am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 
Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp

* commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05':
  Doc change: add toc references to tictactoe sample apps and screen shots.
 2010-05-11 10:18:47 -07:00
Dirk Dougherty
b32c2402c2 Doc change: add toc references to tictactoe sample apps and screen shots. 
Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
 2010-05-10 16:19:52 -07:00
Scott Main
717e135c17 am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp

* commit '62c28caee4a26e106134264f917bacef77438483':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
 2010-05-10 09:56:43 -07:00
Dirk Dougherty
aff856d053 am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp

* commit '0dd3a239519369933d4efa701479c816b4b33874':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
 2010-05-10 09:43:03 -07:00
Scott Main
bf1d0b900e docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc 
Change-Id: Ic240502b8874fdc69d1d97cbf9df0ef925fbc071
 2010-05-07 15:08:36 -07:00
Joe Malin
18457d0c21 Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files 
Change-Id: If43ba08af00c8c9fcf6d05834f8b2a7a719b4bec
 2010-05-07 10:06:53 -07:00
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore 
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
 2010-04-30 13:23:32 -07:00
Scott Main
c4c696ab5b add droiddoc flag to include since-tags for api level 8 
Change-Id: Ib7dc5114b075001cdf78db96dbbaa99644836f8b
 2010-04-19 12:00:15 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data. 
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
 2010-04-08 12:34:45 -07:00
Christopher Tate
e779bdc9b4 Add Backup/Restore sample to the SDK docs 
Part of bug #2545514

Change-Id: I235d33b839924d4bc574fd1e6762d169902e1c8b
 2010-04-07 13:37:00 -07:00
Dirk Dougherty
7b229effcc cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo 
Conflicts:

	docs/html/sdk/installing.jd

Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
 2010-03-26 17:32:26 -07:00
Suchi Amalapurapu
6ffce2e9a3 Add new shutdown observer for MountService. 
Use new observer before rebooting and shutting down.
Add some unit tests for unmount and shutdown code paths
Fix registering/unregistering part in MountService
Use ShutdownThread in PowerManager.reboot()
Add reboot support to ShutdownThread.
Remove MountService code from PowerManagerService.java and Power.java.
Clean shutdown/reboot is handled exclusively by ShutdownThread now.

Change-Id: Iefb157451d3d9c426cb431707b870a873c09123d
 2010-03-09 17:00:18 -05:00