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

159297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
afc3b9e7f5 Merge "docs: studio build output dir name update" into lmp-docs 2014-12-19 05:35:19 +00:00
Joe Fernandez
f110d35785 am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
* commit '8eaf404239286f6179dd032184cab3fa0943834c':
  docs: gradle wrapper security note
 2014-12-19 05:34:39 +00:00
Joe Fernandez
09b41c02af am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit 'e6395cd34c353ad848b6e414f9e9d215311da4c4':
  docs: project file and toc updates
 2014-12-19 05:34:35 +00:00
Joe Fernandez
27cb0a5658 Merge "docs: gradle version update in plugin file" into lmp-docs 2014-12-19 05:34:07 +00:00
Joe Fernandez
c811b88ab1 am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit 'd3d09d874ef0a0ba4156c20c177e2c1daab9797e':
  docs: studio workflow links
 2014-12-19 05:32:50 +00:00
Joe Fernandez
411c779bb7 am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit 'c919f7cfb8c991df998bc93cdebe3b3c9dd752a4':
  docs: studio tips and ticks grammmar typo
 2014-12-19 05:32:46 +00:00
Joe Fernandez
8eaf404239 Merge "docs: gradle wrapper security note" into lmp-docs 2014-12-19 05:29:58 +00:00
Joe Fernandez
e6395cd34c Merge "docs: project file and toc updates" into lmp-docs 2014-12-19 05:28:36 +00:00
Joe Fernandez
d3d09d874e am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit '66e851fa015374a9eaa1efdc33d8072d1d9be3da':
  docs: studio workflow links
 2014-12-19 05:26:49 +00:00
Joe Fernandez
c919f7cfb8 am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit '1092bafa1d5e68406e78222631709c5863ecf2bf':
  docs: studio tips and ticks grammmar typo
 2014-12-19 05:26:45 +00:00
Joe Fernandez
66e851fa01 Merge "docs: studio workflow links" into lmp-docs 2014-12-19 05:22:50 +00:00
Joe Fernandez
1092bafa1d Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 2014-12-19 05:20:53 +00:00
Eric Laurent
38edfda9bd AudioService: fix permission check. 
Clear caller identity before calling TelecomManager.isInCall().

Bug: 18702149.
Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
 2014-12-18 17:40:43 -08:00
Jean-Michel Trivi
9b5257c9c9 MediaSessionLegacyHelper uses global Application context 
MediaSessionLegacyHelper used a Context passed by an application
  which can cause a leak of Activity instances. Use the global
  Application context instead.
Also prevent crash if a null Context is supplied (method not
  documented as requesting a non-null Context).

Bug 18767503

Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
 2014-12-18 16:42:59 -08:00
xinhe
ffe80ab7f6 Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev 2014-12-19 00:07:29 +00:00
Ricardo Cervera
c5fae95935 am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit '48a066db7309095bb7b11d4b56511d2edd3fca07':
  docs: Update wearable lists docs
 2014-12-18 22:35:58 +00:00
Mike Lockwood
8a0399c442 Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 2014-12-18 22:34:00 +00:00
Ricardo Cervera
48a066db73 am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit '60cfb01a46e1569a4f601026aaadaffcc4195728':
  docs: Update wearable lists docs
 2014-12-18 22:29:20 +00:00
Ricardo Cervera
60cfb01a46 Merge "docs: Update wearable lists docs" into lmp-docs 2014-12-18 22:23:27 +00:00
Rich Slogar
1dafeb3041 docs: studio build output dir name update 
b/18670283

Change-Id: Iae80825ba205abbd99561acee0bc63986d195b15
 2014-12-18 14:21:39 -08:00
Rich Slogar
7ddb126da8 docs: gradle version update in plugin file 
b/18679881

Change-Id: Icb8af8e273a2b782d1ce6e605e419dc9d5a306a9
 2014-12-18 14:19:14 -08:00
Mike Lockwood
75b52bb880 BluetoothManagerService: Enforce DUMP permission 
Bug: 18667272
Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
 2014-12-18 14:16:36 -08:00
vandwalle
f87606fe25 Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 2014-12-18 22:16:30 +00:00
Rich Slogar
dcfe5b6ae3 docs: gradle wrapper security note 
b/18709289

Change-Id: Idb179c5426f3e6a6b7d80dbfba6097ed0ecacc86
 2014-12-18 14:03:31 -08:00
Joe Fernandez
c3fb32ab39 am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit '4603c12229ca3dc162c3950a4b020033f11d73be':
  docs: studio device emulator updates
 2014-12-18 21:58:27 +00:00
Rich Slogar
3f8e456be7 docs: project file and toc updates 
b/18681310

Change-Id: I0a4d4a85f60d0e9dccfbec86e6e54a718d43503a
 2014-12-18 13:58:06 -08:00
Joe Fernandez
4603c12229 am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit '18a75595ac8a82d5a61ed99e386a54a8cb0f8dba':
  docs: studio device emulator updates
 2014-12-18 21:50:42 +00:00
Sarah Maddox
4811f9b847 am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit 'ecf0ac290b5ef1b03e307d591df7be2dfb6a877b':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2014-12-18 21:49:19 +00:00
Ricardo Cervera
85f69885f7 docs: Update wearable lists docs 
Bug: 18791586

Change-Id: I83824c67b46ac18944905751d0c8d09a0a5577ae
 2014-12-18 13:13:59 -08:00
Joe Fernandez
18a75595ac Merge "docs: studio device emulator updates" into lmp-docs 2014-12-18 21:10:48 +00:00
Sarah Maddox
ecf0ac290b am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit 'ca23a587a3cf20a5639ee5187b55ea633065886f':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2014-12-18 20:27:23 +00:00
Craig Mautner
2281e7d6a1 Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 2014-12-18 19:55:51 +00:00
Sarah Maddox
ca23a587a3 Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 2014-12-18 19:42:36 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback. 
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
 2014-12-18 11:27:18 -08:00
Jason Monk
c9f0571302 Fix missing subscription list changes 
A missing @Override let the wrong function try to catch changes
to the subscription list.

The SubscriptionManager returns null when no SIMs are in the device,
so handle null as an empty list of subscriptions.

Bug: 18752587
Change-Id: I20ee1bde3f23828860f57b512662ad54ee51baf0
 2014-12-18 14:07:46 -05:00
Sarah Maddox
a4ad770f82 docs: Updates the request-location-updates lesson in the location APIs training course. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I42cc36f861d0455ef9c07b793c64038c572a6e8a
 2014-12-19 06:04:07 +11:00
Ricardo Cervera
9719336b3a am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit '4ef7873d811be5219a00b714d55727bb3e99dedb':
  docs: Adding vector drawables video
 2014-12-18 18:44:39 +00:00
Ricardo Cervera
4ef7873d81 am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit '8e631d2d0a19911700842c35fa8bee1134c2cf41':
  docs: Adding vector drawables video
 2014-12-18 18:38:06 +00:00
Ricardo Cervera
8e631d2d0a Merge "docs: Adding vector drawables video" into lmp-docs 2014-12-18 18:34:32 +00:00
xinhe
ac11ae91c7 take out SIM card, the RSSI Triangle is still full 
Bug:18479509
Change-Id: I96b0e91ae42ad222889c123ebe0c0c1225d9b6a7
 2014-12-18 10:02:14 -08:00
Joe Fernandez
adaef48646 am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit 'e78489b47cd7566f59030032c32f4453b6b65d2e':
  docs: plugin reference update
 2014-12-18 17:54:53 +00:00
Ricardo Cervera
276a324cd6 docs: Adding vector drawables video 
Change-Id: I6ea0e4fd3afb7c6d2e9ba314a92fe8e0128af42e
 2014-12-18 09:49:56 -08:00
Joe Fernandez
e78489b47c am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit 'e22b42b3ae86763db4e8f1f02d2aa64555d7b593':
  docs: plugin reference update
 2014-12-18 17:48:05 +00:00
Joe Fernandez
e22b42b3ae Merge "docs: plugin reference update" into lmp-docs 2014-12-18 17:43:33 +00:00
Michael Runge
37fed329ad Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 2014-12-18 01:49:08 +00:00
Rich Slogar
6dfc3aab02 am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 
automerge: 85e645a

* commit '85e645ac2bf38186dce177e29f7062a3645c7917':
  docs: sdk revision 24.0.2
 2014-12-18 01:33:53 +00:00
Eric Gilmore
2195f58301 am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. 
automerge: 8d2af0f

* commit '8d2af0f9daf672183262a226e9c9410c54c133a2':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:32:41 +00:00
Pavel Zhamaitsiak
3a35934540 Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 2014-12-18 01:27:38 +00:00
Rich Slogar
85e645ac2b am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 
* commit '879cffdec9c6206a3d1f3babfef2b2940a72bfa2':
  docs: sdk revision 24.0.2
 2014-12-18 00:58:03 +00:00