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

9940 Commits

Author SHA1 Message Date
Alex Klyubin
35075a0765 Merge "Document usesCleartextTraffic app-level attribute." 2015-04-16 22:28:06 +00:00
Brian Carlstrom
49cb2775a9 am 81d0aabc: am 40955edf: am 14a982aa: Merge "Document hprof-conv -z" 
* commit '81d0aabcb5af11f8695793dbfac893d17688970e':
  Document hprof-conv -z
 2015-04-16 17:53:43 +00:00
Brian Carlstrom
40955edf9d am 14a982aa: Merge "Document hprof-conv -z" 
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
  Document hprof-conv -z
 2015-04-16 17:31:34 +00:00
Brian Carlstrom
d7931acf4a Document hprof-conv -z 
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
 2015-04-16 10:06:58 -07:00
Alex Klyubin
e35cefbf23 Document usesCleartextTraffic app-level attribute. 
This updates the documentation of the application element of
AndroidManifest.xml to mention the new android:usesCleartextTraffic
attribute.

This also updates the Javadoc of
android.security.NetworkSecurityPolicy and ApplicationInfo to match.

Bug: 19215516
Change-Id: I5c221b56addae8988b4db51994d18ae379d0fbe3
 2015-04-15 14:37:05 -07:00
Joe Fernandez
3abfa03e37 am 808042e6: am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '808042e6c2244b24acb30c0f33439c730fa0acd7':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 02:16:55 +00:00
Joe Fernandez
e635f9b5e0 am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '726466c22517a1dc4d549edfd32fc5447794d29e':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:55:08 +00:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec 
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
 2015-04-14 12:53:12 -07:00
Dirk Dougherty
8cc578c37b am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '38544901e6aa6934b032303be314a92dcde662f3':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:13:35 +00:00
Dirk Dougherty
f2a57c69d4 am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'cda895c53d22496001ae59fae36f751cf04af3ed':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:54:32 +00:00
Dirk Dougherty
00f857c5a1 Merge "Doc change: add new pages for Designed for Families." into lmp-docs 2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
smain@google.com
3c273bbb91 am f46c8f5b: am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'f46c8f5bfcb30d7f9d8b91e6f193d7ab574e05e9':
  initial batch of NDK files for skeleton site build
 2015-04-14 03:10:51 +00:00
Rich Slogar
b8a699c846 am 7fd2be12: am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '7fd2be12d11a33c2ad622d8b49e74d6ba7a12be5':
  docs: systrace update
 2015-04-14 03:10:38 +00:00
Rich Slogar
6f92b72298 am c29f30cb: am 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit 'c29f30cbf1ee6bec3b2ead374aba71002db6faaa':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 03:10:28 +00:00
Mathieu Chartier
7a55461453 am 7e39ae4f: am 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit '7e39ae4fd683f6fd056eae754fde1579fb5a19b6':
  Update "Investigating your RAM usage" for ART
 2015-04-14 03:10:16 +00:00
smain@google.com
c9393a5d70 am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:44:14 +00:00
Rich Slogar
f828c92c5e am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '6b9e30fe959e6c67687c52eeb152de623368695d':
  docs: systrace update
 2015-04-14 02:43:56 +00:00
Rich Slogar
9e58689da6 am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9761530b3fbff0f2d686c4a0f48efa02c159a309':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:43:49 +00:00
Mathieu Chartier
32b675b9f5 am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'd4bcbcfa08502d6feafbe39e9dcb16a38e61f892':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:43:39 +00:00
smain@google.com
4301dd0458 am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:44:52 +00:00
Mathieu Chartier
473989c35d Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 2015-04-13 20:44:18 +00:00
smain@google.com
d60649c541 Merge "initial batch of NDK files for skeleton site build" into lmp-docs 2015-04-13 20:32:38 +00:00
smain@google.com
0178321af6 initial batch of NDK files for skeleton site build 
Change-Id: I00152e817377c072f529940743499a3b6d91f80d
 2015-04-13 12:51:19 -07:00
Alex Klyubin
9b3e005a4e Unhide the new AndroidKeyStore API. 
Bug: 18088752
Change-Id: I93f87cbb1cd04a4a2e34f3d544d678c92cf052ee
 2015-04-13 11:34:04 -07:00
Rich Slogar
3e664c3bda am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update
 2015-04-13 18:30:38 +00:00
Rich Slogar
6656ea4607 am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update
 2015-04-13 18:30:33 +00:00
Rich Slogar
c0559808ee am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option
 2015-04-13 18:30:29 +00:00
Rich Slogar
bdc2010920 Merge "docs: systrace update" into lmp-docs 2015-04-13 18:14:06 +00:00
Rich Slogar
880460a704 Merge "docs: nexus usb driver update" into lmp-docs 2015-04-13 18:13:47 +00:00
Rich Slogar
a7ade2f7f0 Merge "docs: remove adb install option" into lmp-docs 2015-04-13 18:13:10 +00:00
Mathieu Chartier
2c957d4cb9 Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
(cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)
 2015-04-13 17:29:15 +00:00
Mathieu Chartier
f2a4968b3f Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 2015-04-13 17:29:02 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
 2015-04-10 18:34:51 -07:00
Rich Slogar
f75355e4df am acae606f: am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit 'acae606f5dde5fff990ffc840da89fcc61f03c5b':
  docs: remove studio proguard settings from play services
 2015-04-09 19:06:00 +00:00
Rich Slogar
a6b6952bb6 am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '0b1610ff49b042df19fc9071f2811efb642f7df9':
  docs: remove studio proguard settings from play services
 2015-04-09 18:21:06 +00:00
Rich Slogar
36e3f51258 Merge "docs: remove studio proguard settings from play services" into lmp-docs 2015-04-09 17:39:29 +00:00
Eric Gilmore
e71c0e315f am d242647a: am 1fb61c46: am b1044aaf: am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'd242647afa201cb160db1582ac53dec074292446':
  Fixing date.
 2015-04-08 02:15:51 +00:00
Eric Gilmore
1fb61c4688 am b1044aaf: am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'b1044aaf29227b2075e08098b6f5ed5eaf7cf2c0':
  Fixing date.
 2015-04-08 01:29:10 +00:00
Eric Gilmore
aac938a859 Merge "Fixing date." into lmp-docs 2015-04-08 00:05:28 +00:00
Quddus Chong
da7c854e1b am a30020f8: am ef2f390f: am 4559d6ae: am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit 'a30020f8654a72a36e24a97e67865379e6145c2a':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 22:02:29 +00:00
Quddus Chong
d637d01202 am e7c79398: am d8cf94d7: am 0c7f9436: am 47c1835a: am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit 'e7c79398dbfca11357fb6f244aff6fb76e1c8061':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 22:02:20 +00:00
Joe Fernandez
cab79e24fe am de35df74: am 617181bc: am 2e567682: am 038fe2de: am 19a57761: am 95c39774: docs: Small fix for Android Dashboard 
* commit 'de35df74344857690feb0f15e8f83355450a034a':
  docs: Small fix for Android Dashboard
 2015-04-07 22:02:12 +00:00
Joe Fernandez
9064cc7fb4 am 7e2b9599: am f545618f: am 5861b5b6: am 911e4c50: am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit '7e2b95997490a1beda28bbb93284b292e9c44e3c':
  docs: April 2015 Android Dashboard update
 2015-04-07 22:02:01 +00:00
Quddus Chong
ef2f390fa6 am 4559d6ae: am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit '4559d6aefb928edc68da5d0ed301db37bd8b30b7':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 21:18:23 +00:00
Quddus Chong
d8cf94d7da am 0c7f9436: am 47c1835a: am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit '0c7f94365c732ea6d1a4c383ed68005c0e67a619':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 21:18:03 +00:00
Joe Fernandez
617181bcfa am 2e567682: am 038fe2de: am 19a57761: am 95c39774: docs: Small fix for Android Dashboard 
* commit '2e567682a2802170a3f5fd7f621296178a397541':
  docs: Small fix for Android Dashboard
 2015-04-07 21:17:55 +00:00
Joe Fernandez
f545618fd2 am 5861b5b6: am 911e4c50: am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit '5861b5b618cf891ae490c1832f15b101e6b4a090':
  docs: April 2015 Android Dashboard update
 2015-04-07 21:17:49 +00:00
Eric Gilmore
4480bdad95 Fixing date. 
Change-Id: Ia406bec97cda0ae309abbb8c538ad4ea3b4e9d42
 2015-04-07 11:58:52 -07:00