Jeff Sharkey
996b60be9b
am 7831c56e: Merge "Handle libcore, dalvik, gov imports."
...
* commit '7831c56ef524df688b6fe7a151671c92a6938837':
Handle libcore, dalvik, gov imports.
2013-04-02 10:41:41 -07:00
Jeff Sharkey
7831c56ef5
Merge "Handle libcore, dalvik, gov imports."
2013-04-02 17:20:27 +00:00
Ying Wang
73c1230224
Add host bin modules for explicit dependency
...
This fixes the build error:
development/build/sdk.atree:66: couldn't locate source file:
bin/llvm-rs-cc
Previously llvm-rs-cc was indirectly required via some intermediate
targets and now the chain is broken.
Change-Id: I722eee80deb03b219a16fe1c18fe87439ac8ff98
2013-04-01 17:01:43 -07:00
Andrew Hsieh
3c10a2037e
Fix sys/un.h to be included on its own
...
See https://code.google.com/p/android/issues/detail?id=53711
https://android-review.googlesource.com/#/c/42763
Change-Id: Ibd8a445dfde752cddab61b3ae53ad077738701ea
2013-04-01 14:02:06 +08:00
Amith Yamasani
441165c7a5
Merge "App limits sample" into jb-mr2-dev
2013-03-30 01:52:02 +00:00
Amith Yamasani
447d1e3d6c
App limits sample
...
Shows how to expose app restrictions for both simple types
and custom intents.
Change-Id: I95d422d1d637bd4bdb4f731d862975a160b65a50
2013-03-29 18:45:37 -07:00
Nick Kralevich
97e5ad6387
OptionalPermissions: fix call to buildPermissionRequestIntent
...
There's no need to call getApplication().
Change-Id: I56e8a6a4ab230275c70e240e53a893e05400f2f9
2013-03-28 15:14:28 -07:00
Nick Kralevich
d3b17b74c1
Merge "Initial checkin: optional permissions sample code" into jb-mr2-dev
2013-03-28 00:14:52 +00:00
Nick Kralevich
2ad812d4aa
Initial checkin: optional permissions sample code
...
This is an initial checkin of a small demonstration program
which demonstrates how optional permissions can be used.
This app can do three things, which require permissions:
* Vibrate the device (android.permission.VIBRATE)
* Access the internet (android.permission.INTERNET)
* Get the phone number (android.permission.READ_PHONE_STATE)
At install time, this app has zero permissions. However, the app can
request that the user grant permissions, based on pressing the "Prompt"
button. The user can then choose to allow or deny the permissions.
Known bugs and limitations:
* Once a permission is granted, it currently cannot be revoked by the
application nor the user.
* Due to the way it's implemented, the INTERNET permission requires a
restart of the application. That isn't in the sample code.
* Getting the device phone number doesn't make sense for a tablet.
This code was mostly written by klyubin@google.com with heavy
modification by myself.
Change-Id: I620db52c4a1f10ac7aa604ba34f77f7ec03af023
2013-03-27 16:54:04 -07:00
Andrew Hsieh
63222c6fcc
am 175fb816: am 8d04b131: Merge "ndk: Fix potential event handling issue in android_native_app_glue"
...
* commit '175fb816d20560958473cdc1bbe0fc5034e6b15d':
ndk: Fix potential event handling issue in android_native_app_glue
2013-03-27 13:01:48 -07:00
Andrew Hsieh
0c1dc2e665
am b94ab7c1: am f7fe3ca6: Merge "Deprecate __set_errno; Add #include <stdint.h> in elf.h"
...
* commit 'b94ab7c1706c306809b6875e5bb9061d77b65e49':
Deprecate __set_errno; Add #include <stdint.h> in elf.h
2013-03-27 13:01:45 -07:00
Andrew Hsieh
175fb816d2
am 8d04b131: Merge "ndk: Fix potential event handling issue in android_native_app_glue"
...
* commit '8d04b13138cd1b86e6ee7207eac0a0f98ae978bb':
ndk: Fix potential event handling issue in android_native_app_glue
2013-03-27 11:26:28 -07:00
Andrew Hsieh
b94ab7c170
am f7fe3ca6: Merge "Deprecate __set_errno; Add #include <stdint.h> in elf.h"
...
* commit 'f7fe3ca6dece533962046712269b443d4e6a3d87':
Deprecate __set_errno; Add #include <stdint.h> in elf.h
2013-03-27 11:09:05 -07:00
Andrew Hsieh
8d04b13138
Merge "ndk: Fix potential event handling issue in android_native_app_glue"
2013-03-27 18:08:08 +00:00
Andrew Hsieh
f7fe3ca6de
Merge "Deprecate __set_errno; Add #include <stdint.h> in elf.h"
2013-03-27 17:58:48 +00:00
Andrew Hsieh
3ccf4f2c03
Deprecate __set_errno; Add #include <stdint.h> in elf.h
...
1. __set_errno is deprecated and subject to removal in future release
2. elf.h is seen to be included alone, causing compilation error due
to undefined uint32_t and uint64_t
Change-Id: I4ca348a8ba0689eb3880622dcf5c53be470c57e8
2013-03-27 10:44:19 -07:00
Jeff Sharkey
06e6c6ad45
Handle libcore, dalvik, gov imports.
...
Change-Id: I25a9f1071f29eff615db03f3803a4ad1b5e6bec9
2013-03-26 15:33:56 -07:00
Jeff Sharkey
ccf3ef27ce
Merge "Remove reference to <root-path>." into jb-mr2-dev
2013-03-26 17:13:12 +00:00
Andrew Hsieh
08b584acaf
am 67ef19d0: am 83f00b45: Merge "[libportable] Add fenv support."
...
* commit '67ef19d061d8351226fc4eacfa053cd58983b976':
[libportable] Add fenv support.
2013-03-26 07:41:13 -07:00
Andrew Hsieh
67ef19d061
am 83f00b45: Merge "[libportable] Add fenv support."
...
* commit '83f00b45c7cbd57c7b82ccda73f2e49c6a872110':
[libportable] Add fenv support.
2013-03-26 07:38:15 -07:00
Andrew Hsieh
83f00b45c7
Merge "[libportable] Add fenv support."
2013-03-26 14:29:07 +00:00
Lai Wei-Chih
521bcfb17a
[libportable] Add fenv support.
...
Fix ndk/tests/device/fenv.
Change-Id: I46e1b47c3bec5213e827fabe311ef9e29a28195b
2013-03-26 22:09:17 +08:00
Jeff Sharkey
29045946c0
Remove reference to <root-path>.
...
Bug: 8409523
Change-Id: I42834e33d0d664977dca9277ae364d2cf8986d07
2013-03-25 16:16:51 -07:00
Fabrice Di Meglio
e7b90faf8f
Merge "Fix ExpandableList1 sample" into jb-mr2-dev
2013-03-25 21:20:25 +00:00
Chris Banes
0014f87c54
Merge "Fixes AppCompat build location" into jb-mr2-dev
2013-03-25 20:42:07 +00:00
Scott Main
8e2b7c5d3f
am e92f6467: am 35964ea6: am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit 'e92f6467d0c85c7f2f8f5f5dc1dbfb8695f8c545':
add support library JAR to sample
2013-03-25 09:02:54 -07:00
Scott Main
e92f6467d0
am 35964ea6: am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit '35964ea619381ed65aa04ea2e5071ebaa1b56f92':
add support library JAR to sample
2013-03-25 09:00:26 -07:00
Scott Main
35964ea619
am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit '449326f1a88f92a1aebe7233b0ee66b02d0e1e67':
add support library JAR to sample
2013-03-25 08:58:14 -07:00
Scott Main
449326f1a8
am d49fbdbc: add support library JAR to sample
...
* commit 'd49fbdbcc12de0b4364beaefece82242f1520806':
add support library JAR to sample
2013-03-25 08:56:27 -07:00
Chris Banes
063f035dd8
Fixes AppCompat build location
...
Fixes the appcompat build so that the resulting
lib is with the library project.
Change-Id: I9d7c79bc1b7c9e4d0b894d5c9ce2f7e5e901184b
Signed-off-by: Chris Banes <chrisbanes@google.com >
2013-03-25 09:34:53 +00:00
Jeff Brown
fbe0890bb4
Rename methods of RouteController.
...
Add basic support for returning stream ids.
Change-Id: Iaa11980e6195e23bd598075cb066c6234f000198
2013-03-22 19:46:23 -07:00
Elliott Hughes
d4f9f64beb
am 2cb06fc1: am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."
...
* commit '2cb06fc1f079bf089ff7dfd2844b5c0935bcc1d3':
Remove dead code that's keeping other dead code in frameworks/base alive.
2013-03-22 19:02:25 -07:00
Elliott Hughes
2cb06fc1f0
am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."
...
* commit 'a6eaa197f3f6d96696cddf5c2bf86ac628e461d8':
Remove dead code that's keeping other dead code in frameworks/base alive.
2013-03-22 18:59:48 -07:00
Elliott Hughes
a6eaa197f3
Merge "Remove dead code that's keeping other dead code in frameworks/base alive."
2013-03-23 01:40:08 +00:00
Fabrice Di Meglio
de817c95df
Fix ExpandableList1 sample
...
- also increase android:targetSdkVersion to 17
Change-Id: Ibceb38f5514a7c321f75d267e40c338c0340b1ef
2013-03-22 16:28:46 -07:00
Dianne Hackborn
8439ba4536
Merge "Add TransportController API demo." into jb-mr2-dev
2013-03-22 23:17:07 +00:00
Raphael Moll
64f2fc34e8
am fa3fce92: (-s ours) am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit 'fa3fce9237c1d9641031d306242b45b979309f2c':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:46:13 -07:00
Raphael Moll
fa3fce9237
am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit '7dece61ef437252062171d256c482b5b97660d68':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:42:25 -07:00
Raphael Moll
7dece61ef4
am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit 'fbb2b119dee4a84a7377e9f4f9e4facd83a6ae22':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:40:19 -07:00
Dianne Hackborn
d2655277cd
Add TransportController API demo.
...
Change-Id: Id852ac8de1bcfbfba2d9e8557664c1aaa1e75df4
2013-03-22 14:28:52 -07:00
Raphael Moll
9ca69cf21f
SDK: Generate build-tools package.
...
(cherry-picked from bc7c8c5fc5 )
Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 13:38:56 -07:00
Raphael Moll
a7a51a397e
resolved conflicts for merge of 9583d2ed to jb-mr2-dev
...
Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1
2013-03-22 13:05:32 -07:00
Raphael Moll
fbb2b119de
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
The new layout is actually a major change.
Change-Id: If2a3782ac6ed9b9c26847155443d38612c5a2122
2013-03-22 13:01:31 -07:00
Raphael Moll
9583d2ed3a
am d738f0d7: Merge "SDK: Build/Platform-tools revision 17."
...
* commit 'd738f0d746d66930074fcdbddc4cd4f134bd62a9':
SDK: Build/Platform-tools revision 17.
2013-03-22 12:57:33 -07:00
Raphael Moll
d738f0d746
Merge "SDK: Build/Platform-tools revision 17."
2013-03-22 19:44:33 +00:00
Raphael Moll
d59536eae6
SDK: Build/Platform-tools revision 17.
...
The new layout is actually a major change.
Change-Id: I835fa68db78cd1843254154466f61f48bf6d71d0
2013-03-22 11:18:05 -07:00
Raphael Moll
11ad495f11
am 205d337b: am 6d1249e6: Merge "SDK: Generate build-tools package."
...
* commit '205d337b9db27ef87b2849bef0ac092b3200cb1e':
SDK: Generate build-tools package.
2013-03-22 11:11:36 -07:00
Raphael Moll
8a8a3025bb
resolved conflicts for merge of c6dc2830 to jb-mr2-dev
...
Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
2013-03-22 11:09:16 -07:00
Raphael Moll
205d337b9d
am 6d1249e6: Merge "SDK: Generate build-tools package."
...
* commit '6d1249e62678c12f3cac62c7104db52b3a415dd1':
SDK: Generate build-tools package.
2013-03-22 11:03:12 -07:00
Raphael Moll
c6dc283043
am 8e9aa76f: am ef196297: SDK: Place platform-tools NOTICE file in proper directory.
...
* commit '8e9aa76f513c16243a08bb7f3806f4dbc8477ad6':
SDK: Place platform-tools NOTICE file in proper directory.
2013-03-22 10:54:48 -07:00