Commit Graph

106 Commits

Author SHA1 Message Date
Bob Badour
082705bfb3 Fix license texts.
Push specific licenses down the tree toward the leaf directories.

Remove extra Apache 2.0 license texts--just use Android-Apache-2.0

Test: m nothing
Change-Id: Ibee25f75f5933699d6f43acdc192b2ada6823757
2022-01-20 19:04:52 +00:00
Jeff Sharkey
29bc7dcc26 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I56dd8778516103367dc17ae55bdff4457185de46
2020-07-30 20:05:08 -06:00
Jeff Vander Stoep
426027aac2 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Iab077f256ff3776495302606572f384d82ab171f
Merged-In: Iab077f256ff3776495302606572f384d82ab171f
2019-07-17 21:34:36 +00:00
Bob Badour
d41e5f7851 Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

Each of the images was altered using the exiftool:

exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0

Change-Id: I557d0129617164209a3eec7ec2d228f266643ca0
2019-06-05 20:08:08 +00:00
Dianne Hackborn
7049e08d6f Fix issue #72116995: Add permission guarding Service#startForeground
Bug: 72116995
Test: atest CtsAppTestCases
Change-Id: I3fab8561028d5c2b54a5e8468f7ff51bcd7bc3df
2018-03-05 17:00:51 -08:00
Ian Pedowitz
b19c1b8ec6 Revert "Fix issue #72116995: Add permission guarding Service#startForeground"
This reverts commit 7890baea48.

Reason for revert: b/73224471

Bug: 73224471
Bug: 72116995
Change-Id: Ife5dc5c14026ae7dcb126b0b3c3e7701ed3eaebe
2018-02-12 16:12:26 +00:00
Dianne Hackborn
7890baea48 Fix issue #72116995: Add permission guarding Service#startForeground
Bug: 72116995
Test: atest CtsAppTestCases
Change-Id: I88e3f6f1395b7ee0c0af41c9f7e9a5971da17631
2018-02-07 14:05:31 -08:00
Dianne Hackborn
0d3c8bac64 Revert "Fix issue #72116995: Add permission guarding Service#startForeground"
This reverts commit cbe2f1bf27.

Test: NA
Bug: 72116995
2018-01-25 12:55:58 -08:00
Dianne Hackborn
cbe2f1bf27 Fix issue #72116995: Add permission guarding Service#startForeground
Bug: 72116995
Test: atest CtsAppTestCases
Change-Id: Ib8471d514bc2c126c34a867ca8ff77d90be9661e
2018-01-21 19:57:14 -08:00
Trevor Johns
8a66f8cbc0 Update sample prebults for 2017-02 release (nyc-mr1-dev)
developers/samples/android commit: 6f3586bc08b96d14d8f1315f4839ac59aa39798c

Change-Id: I08c9af2d58f1b3314eba807048dc05175a58e164
2017-02-09 00:45:30 -08:00
Trevor Johns
0af1e772c4 docs: Add new samples for N MR1
- AppShortcuts
- CommitContentSampleApp
- CommitContentSampleIME

Change-Id: I3cefc134839f944b1c0c5efc943fb779c7e7ee70
2016-10-18 03:19:42 -07:00
Trevor Johns
697d71f7cc Syncing latest sample prebuilts for mnc-dev.
developers/build: 3c56004c2e943b3a87d99958c18950de0f89f3a7
developers/samples/android: d72f3df26721c64aa403e3b6d400cf8b99260dd1

Change-Id: Ice543fd11f2956aacfa3301bf9bdb4b1f49e9c4d
2016-09-29 05:17:16 +00:00
Trevor Johns
ef51b0db8e docs: Add AccelerometerPlay sample to prebuilts
Change-Id: I8e4146cd00df889e60aa9f03f9a79231b02dfdd5
2016-08-28 10:58:43 +00:00
Trevor Johns
a374bcd44d docs: Update prebuilts for nyc-dev samples
Synced to commits:
- //developers/samples/android
  fc1c2eac13aa87531f030f8c65d7e27c301135af
- //developers/build
  18730e97939c9545a26e52d135a99045c86abeaf

Change-Id: I88952b8f86921739af9fed6b87d39a72af835748
2016-08-11 22:59:11 +00:00
Trevor Johns
5a6b719823 samples: Sync prebuilts for nyc-dev
developers/samples/android: f9872ded3bb6cd3c01ab0881a58764f5171b4c64
developers/build: 23e77f8a040c0b35531a68e776363f32fa7feeeb

Change-Id: I93e7c66e0cff22d3852d36a1a1257bb10eec3ba0
2016-06-15 11:19:33 -07:00
Trevor Johns
17be9b742a Update prebuilts for mnc-docs am: 7e9f0673a1 am: a466e36fd7
am: 2997b7d8e9

Change-Id: I7a96dccf26b3239c9086e38acc7c962e7d1f6cf4
2016-06-15 01:40:30 +00:00
Trevor Johns
7e9f0673a1 Update prebuilts for mnc-docs
developers/build: fb039d88ed8e9183cae9ce510bf9c907d23ecc50
developers/samples/android: 7c3c09dcf092593adb8c13f8e15260f4da0a799a

Note: This was previously committed on May 18 2016, but wasn't
automerged. Replaying commit to bring browseable back into sync
downstream.

(cherry picked from commit 8e7e496ae9)
Bug: 29127946
Change-Id: I6275f830532c3c6ce006756aecc3c2ae7e06873d
2016-06-14 18:20:56 -07:00
Trevor Johns
ab5389446c resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67
am: b5dfaab473

Change-Id: Ife6b59d2c9c3ff193afe1b0bb1a51e216eee5eb6
2016-06-15 00:48:31 +00:00
Trevor Johns
1842261dea resolve merge conflicts of 08f72b4 to mnc-mr-docs
Change-Id: Ibdd172d148d5983b6578adf7cb0e6335748ca654
2016-06-14 17:21:35 -07:00
Trevor Johns
08f72b4693 docs: Update samples prebuilts for mnc-docs
Change-Id: I7175f178f95d76d9056d8e87b5a96700e3c9309c
2016-06-14 16:42:16 -07:00
Trevor Johns
8e7e496ae9 Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)
developers/build: fb039d88ed8e9183cae9ce510bf9c907d23ecc50
developers/samples/android: 7c3c09dcf092593adb8c13f8e15260f4da0a799a

Change-Id: I11ffce54e0f557375c2040682923042e7af5b0ca
2016-05-18 00:47:32 -07:00
Narayan Kamath
d6ea1e86f2 Tidy up uses of Integer.valueOf.
Use parseInt when the result is assigned to an int. Allocates fewer
objects.

bug: 28078871
Change-Id: Icbb0507949b71bc0a729f2e65309dab939b3d853
2016-04-19 19:02:51 +01:00
Trevor Johns
419a0f19bc Update sample prebuilts for mnc-docs
Synced to //developers/samples/android commit
243feb49e8d1753b746f69ae5519eaace0e50605.

Change-Id: I9255d2ad8f68669d77124b7840184171fb5a801b
2016-01-08 16:54:53 -08:00
Trevor Johns
8af0d723f4 Sync sample browser prebuilts for mnc-docs
Synced to //developers/samples/android commit
44c699bf11bae6c9eef1f8c56bd405d547e179e6.

Change-Id: I61ceec197e6fa420fc5a6d16e703aa1aab2b0c4e
2015-11-17 21:38:44 -08:00
Trevor Johns
03d12cb64f Update browseables for mnc-docs.
Fixing category bug for security samples.

Synced to //developers/samples/android commit
47d41b467386e598916e7f170cc1c28662fdb831.

Change-Id: I11bf733fc74d20ab22812c91bcb3c67ac9b5c4f2
2015-10-15 13:49:35 -07:00
Trevor Johns
40f73d6608 Syncing prebuilts for mnc-docs
Synced to //developers/samples/android commit
690e58b1ea8054f0e745ba4e468f49b8e6210673.

Change-Id: I03a5b1930a00d389a05ab0baf173e678e8825705
2015-10-07 16:14:59 -07:00
Trevor Johns
352925b966 Update sample prebuilts for mnc-docs
Synced to //developers/samples/android commit
1a0b1951b01698fe28a2fa59ba76a2e8076afc84.

Change-Id: I98ab8b96eb0d0cf491d3202b0371176c03847886
2015-10-02 16:41:45 -07:00
Trevor Johns
6e395505c4 Sync sample prebuilts for mnc-docs
Synced to //developers/samples/android commit
ec5f8543a1e474570a257df386260ac8a206aded.

Change-Id: I6424be01378300c9c35446f12bb8ad43d771d238
2015-09-04 11:10:49 -07:00
Trevor Johns
8491f02e6e Sync sample prebuilts for mnc-docs
Synced to //developers/samples/android commit
7c1cbd61d1dea342322530bee4228d0d86bdeca1.

Change-Id: I682ebe15bb1d495866dbc8d43453cd7351aef5db
2015-08-29 00:28:08 -07:00
Trevor Johns
fe105b4596 Sync sample prebuilts for mnc-docs
Synced to //developers/samples/android commit
7bc4d37c1eddd8b7a464a7f7fdc26b51387cf968.

Change-Id: If83a3a126ffc0f6218419caa647975ed0b2b3cc8
2015-08-28 18:28:36 -07:00
Trevor Johns
3e0de4d1f8 Sync sample prebuilts for mnc-docs
Synced to //developers/build commit 754835569e.

Change-Id: I5213d795af8dd9f257bc63a424563c2da647e6cc
2015-08-20 23:42:18 -07:00
Trevor Johns
8155647801 Sync sample prebuilts for mnc-dev
Synced to //developers/samples/android commit 57690c2111.

Change-Id: Ie10e7bbcf4fd9dfb4db02b8cffa4e47d88076315
2015-08-19 17:38:27 -07:00
Trevor Johns
c8e94bf583 Sync mnc-dev sample prebuilts
Syncing to //developers/samples/android commmit 2be5f5ca32.

Change-Id: Ia08c63655bd122c7fbb0cc3a50eec95d8edcb3f1
2015-08-17 09:37:47 -07:00
Trevor Johns
a56a634166 Update sample prebuilts to use latest deps
Pulling in dependency changes from //developers/build commit 5d58bc4802

Change-Id: Ie7a807995dc5ffbaa2c0da2cc51795553495196b
2015-08-14 16:18:55 -07:00
Trevor Johns
d95a687e5a Sync sample prebuilts for mnc-dev
Synced to //developers/samples/android commit 89d2da0f4b.

Change-Id: I904da8210517922531d1ac1ba1e747f1c7bf00b3
2015-08-13 21:10:42 -07:00
Dianne Hackborn
424fb60606 Change MNC codename to just M.
Change-Id: If86839c5d1f0bf4f013aa786ba2dc5bcb39527f8
2015-07-29 15:21:36 -07:00
Trevor Johns
296083e2fc Sync sample prebuilts for mnc-dev
Synced with /developers/samples/android commit
415e5ce8ad7128bed20c28e923f2f91bbfff46a9.

Change-Id: I8716d051213210ec991fb692f79848a9f086a52c
2015-05-27 13:34:35 -07:00
Trevor Johns
48b7225a27 Sync sample prebuilts
Synced to lmp-mr1-ub-docs commit 9b3abfde74ffa708734d2b8a09e1de0a0c82451c.

Change-Id: Ibae1c4729c9b8b4c0de2faebb998459a8da524e1
2015-05-20 22:04:28 -07:00
Trevor Johns
20d9500115 Sync sample prebuilts for lmp-mr1-ub-docs
Synced to //developers/samples/android commit
7e6f96a4bd8d07daf2f9e464dad32e7daa62999b

Change-Id: I3c44d32aca1a5513f52e71f28d1848a055d03aab
2015-05-12 14:33:38 -07:00
Trevor Johns
434d41c45d Update samples prebuilts for lmp-mr1-ub-docs
Synced to developers/samples/android commit
54bab34b386e343e9d0ea75a5fb8d13db2c71eb5.

Change-Id: I1c9d9d2c1f53a051d7b4d85303d5c01ab6f16e68
2015-05-08 19:29:42 -07:00
Trevor Johns
03236391f1 Sync sample prebuilts to lmp-mr1-ub-docs
Upstream commit: f76d10f3b6abad250d94b5b9a5c73faae6ce8cc5

Change-Id: I32f2690e36f444cae123134268472fb526c26163
2015-04-28 10:39:50 -07:00
Trevor Johns
0cb8868739 Update sample browseables
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.

Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
(cherry picked from commit 13b15893e3)
2015-04-23 21:33:11 +00:00
Trevor Johns
951e7288e6 Fix browseable category for NfcProvisioning sample
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.

Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
2015-04-02 13:29:30 -07:00
Trevor Johns
77b5d394ff Update sdk.atree and samples/browseable for lastest samples release
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Trevor Johns
abededd8f7 Docs: Sync browseable samples for lmp-docs
Synced to developers/samples/android commit
bc036ecdf44cd03163c206096172299f3940b057.

Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
2014-12-09 18:49:04 -08:00
Trevor Johns
a35cfcea15 Merge "Refresh prebuilts for SpeedTracker sample" into lmp-docs 2014-11-19 22:57:41 +00:00
Trevor Johns
ff010f6843 Refresh prebuilts for SpeedTracker sample
Change-Id: I36819e897b0fe983f16d3ced117d4a925b0bdd47
2014-11-19 14:56:55 -08:00
Nagesh Susarla
109db5b4e1 Update browseable for MessagingService.
1. layout fixes
2. name changes in sample. (redo of ag/586904 which was lost from lmp-docs)

Change-Id: I3a2afafb5b878ba90b8ae6314220af19b3dfbb09
2014-11-19 14:09:41 -08:00
Nagesh Susarla
34b5d8e7a0 Update browseable for MediaBrowserService.
Change-Id: Iadb01b70091b9102a8445cd1fe1e1d974127e88f
2014-11-19 10:30:19 -08:00
Renato Mangini
0d0f4d632c Update browseable for MediaBrowserService sample.
Change-Id: I699899cc27b3f9b1f7003d050169e67b29c53eb7
2014-11-18 19:29:45 -08:00