Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,978 Commits 3 Branches 0 Tags
c2ddb3e452d4d3a360ad697bf89a786f2af7a377
Commit Graph

192978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
c2ddb3e452 Merge "Switch runtime permission icons to vectors" into mnc-dev 2015-05-26 19:04:29 +00:00
Jean-Michel Trivi
5c37f1ee57 Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev 2015-05-26 19:01:20 +00:00
Jean-Michel Trivi
48d88128bd Remove temporary javadoc for android.media.AudioFormat 
Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
 2015-05-26 11:50:11 -07:00
Jason Monk
627973d89a Switch runtime permission icons to vectors 
Bug: 21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb
 2015-05-26 14:33:53 -04:00
Abodunrinwa Toki
da1b398173 Merge "Support icons in the FloatingToolbar" into mnc-dev 2015-05-26 18:26:37 +00:00
Alex Klyubin
7bf011ab92 Merge "Remove KeyStoreParameter.getContext()." into mnc-dev 2015-05-26 17:57:54 +00:00
Alex Klyubin
09a3b7f2ac Remove KeyStoreParameter.getContext(). 
This method isn't there in the released API and we don't need it in
the new API.

Bug: 18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9
 2015-05-26 10:44:53 -07:00
Paul Jensen
46ed04de08 Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 2015-05-26 17:37:33 +00:00
Paul Jensen
7891fcb52a Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev 2015-05-26 17:33:26 +00:00
Alan Viverette
75a857cec5 Merge "Handle error states when refreshing accessibility node" into mnc-dev 2015-05-26 17:29:39 +00:00
Jean-Michel Trivi
dfe318d712 Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev 2015-05-26 17:27:07 +00:00
Rich Slogar
7ae3520e6f am 59e5d718: am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs 
* commit '59e5d7189911fc86a65624a337a75d8f840cff3d':
  docs: support library 22.2 updates
 2015-05-26 17:23:48 +00:00
Jason Monk
7cd8a7e1bd Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev 2015-05-26 17:19:10 +00:00
Chris Craik
87d8bb3d85 Merge "Unflip TextureView getBitmap readback" into mnc-dev 2015-05-26 17:19:03 +00:00
Chet Haase
1ddc95ebb2 Merge "Clarify example for Deep Share" into mnc-dev 2015-05-26 17:15:59 +00:00
Jason Monk
05b86bc027 SysUI: Move LocationControllerImpl receiver to bg 
Bug: 19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757
 2015-05-26 13:11:35 -04:00
Rich Slogar
59e5d71899 am a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs 
* commit 'a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
  docs: support library 22.2 updates
 2015-05-26 17:07:42 +00:00
Jason Monk
80370952e9 Merge "QS: Only show summary for active wifi" into mnc-dev 2015-05-26 17:01:51 +00:00
Rich Slogar
a67fa862dc Merge "docs: support library 22.2 updates" into mnc-preview-docs 2015-05-26 16:58:43 +00:00
Jason Monk
283c8b72aa QS: Only show summary for active wifi 
Bug: 20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17
 2015-05-26 12:54:12 -04:00
Jason Monk
1622428879 Merge "Add constants for permissions granted status api" into mnc-dev 2015-05-26 16:32:57 +00:00
James Cook
327c364113 Merge "Cancel voice assist session on user switch" into mnc-dev 2015-05-26 16:16:35 +00:00
Joseph Wen
f981ea95f2 Merge "Update Statement Service" into mnc-dev 2015-05-26 15:11:09 +00:00
dcashman
b7b7b5ece8 Merge "Set error code on failed keyset manifest parsing." into mnc-dev 2015-05-26 14:57:27 +00:00
Jason Monk
9cfa0cc51e Add constants for permissions granted status api 
Bug: 21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
 2015-05-26 10:26:18 -04:00
Lorenzo Colitti
82babcd83a Specify more information in DhcpClient PendingIntents. 
- Specify the package name. This provides a bit of security, but
  not much since the package is "android".
- Specify the interface name so we can run more than one client
  at a time.

Bug: 21395858
Bug: 19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e
 2015-05-26 12:40:12 +00:00
Abodunrinwa Toki
b21562c465 Support icons in the FloatingToolbar 
Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
 2015-05-26 12:55:17 +01:00
Martijn Coenen
99fbb56a0a Merge "Don't count lowmem mappings as memory used." into mnc-dev 2015-05-26 08:11:28 +00:00
Selim Cinek
912696e797 Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev 2015-05-26 07:34:18 +00:00
David Friedman
35bf832248 am 515444ff: am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942. 
* commit '515444ff434ff93c7b5c24bc356973f385e39adf':
  Docs: Submitting fix for build-breaking CL 695942.
 2015-05-26 06:04:54 +00:00
David Friedman
337089c8d1 am e0f14f48: am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation 
* commit 'e0f14f48416484029a478e17e6b2c5708e0e0010':
  Docs: Sample-walkthrough chapters for NDK documentation
 2015-05-26 06:04:49 +00:00
Oliver Woodman
b4ad97fc19 am a61df8f6: am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs 
* commit 'a61df8f63c55d96c5443449a9fb538ad97224a52':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
 2015-05-26 06:04:44 +00:00
Johan Euphrosine
be0742e8ee am 4170d9e0: am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css 
* commit '4170d9e05b5477d75e4d8a12718e5d7b6aff3cdd':
  frameworks/base/docs/ndk: add missing doxygen css
 2015-05-26 06:04:38 +00:00
David Friedman
515444ff43 am db9274e7: am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942. 
* commit 'db9274e70fcedc21d08abe340e7ef47d35258e50':
  Docs: Submitting fix for build-breaking CL 695942.
 2015-05-26 05:53:08 +00:00
David Friedman
e0f14f4841 am c25ff8e2: am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation 
* commit 'c25ff8e2513e78b5e22d30b6fe513fdfb2f63643':
  Docs: Sample-walkthrough chapters for NDK documentation
 2015-05-26 05:53:03 +00:00
Oliver Woodman
a61df8f63c am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs 
* commit '056bc731ca7a53067027b0e72f58779aaf3c558a':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
 2015-05-26 05:52:59 +00:00
Johan Euphrosine
4170d9e05b am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css 
* commit '165d4585605f0fd7bcab798d9759f465ce4dca44':
  frameworks/base/docs/ndk: add missing doxygen css
 2015-05-26 05:52:54 +00:00
David Friedman
db9274e70f am f8cd49ae: am d580302d: Docs: Submitting fix for build-breaking CL 695942. 
* commit 'f8cd49ae178a29471d1424726b23a593e9ab43a1':
  Docs: Submitting fix for build-breaking CL 695942.
 2015-05-26 05:42:13 +00:00
David Friedman
c25ff8e251 am e11744fe: am 4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation 
* commit 'e11744fefdb1678dc369a7fea5aaaf0a290fb697':
  Docs: Sample-walkthrough chapters for NDK documentation
 2015-05-26 05:37:15 +00:00
Oliver Woodman
056bc731ca am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs 
* commit '1ddb7caedba247aa9174fc6c78c4ea6b3b4f5a89':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
 2015-05-26 05:37:07 +00:00
Johan Euphrosine
165d458560 am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css 
* commit '1ccbe54f2d651df7b9f9e5dfd3b58eaa2d92a9c8':
  frameworks/base/docs/ndk: add missing doxygen css
 2015-05-26 05:37:01 +00:00
David Friedman
f8cd49ae17 am d580302d: Docs: Submitting fix for build-breaking CL 695942. 
* commit 'd580302d622e4583c7ab2db8759ea8036614df6e':
  Docs: Submitting fix for build-breaking CL 695942.
 2015-05-26 05:26:58 +00:00
David Friedman
d580302d62 Docs: Submitting fix for build-breaking CL 695942. 
Change-Id: Ic384cfca07f7317c07e33d584340f1678a9f99e4
 2015-05-25 21:53:23 -07:00
Adrian Roos
47cfee9d03 Fix initial keyguard user switcher state 
Bug: 18411080
Change-Id: I506968ee6101069361d83f7ef386802f5856a68e
 2015-05-26 01:10:37 +00:00
Guang Zhu
20c8fcaae5 Merge "update app compatibility post launch detection" into mnc-dev 2015-05-25 19:38:42 +00:00
Dirk Dougherty
b9bc972011 am 31a84561: am 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs 
* commit '31a84561ee28278ee0995c6cc27054b96372041f':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
 2015-05-25 19:32:10 +00:00
Dirk Dougherty
31a84561ee am 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs 
* commit '0417dbac1358661e2101e7ff1c9a873c59714bb9':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
 2015-05-25 19:19:50 +00:00
Guang Zhu
9f521c9b17 update app compatibility post launch detection 
decide if the app is still running after launch by checking
running tasks and look for a task with base activity belonging
to the package launched.

Change-Id: Ibb3894e765ccbca62f803decc3c1c1f36dc2d454
 2015-05-25 12:10:36 -07:00
Dirk Dougherty
0417dbac13 Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs 2015-05-25 19:07:24 +00:00
Geoff Mendal
47e745c978 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-25 18:09:38 +00:00