Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hao
51bdc629f5 am e06184e4: Merge "Add mips64 support to app_process." 
* commit 'e06184e4b1f2228f404a3346b7355219b437c28a':
  Add mips64 support to app_process.
 2014-12-18 20:25:39 +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
Jeff Hao
e06184e4b1 Merge "Add mips64 support to app_process." 2014-12-18 19:18:54 +00: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
Alex Klyubin
e48aec9e7f am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." 
* commit 'ff35642e4732771a275e0ba8147af4a5d77f8419':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 17:45:35 +00:00
Joe Fernandez
e22b42b3ae Merge "docs: plugin reference update" into lmp-docs 2014-12-18 17:43:33 +00:00
Alex Klyubin
ff35642e47 Merge "Remove DefaultHostnameVerifier from preloaded-classes." 2014-12-18 17:40:46 +00:00
Olawale Ogunwale
5cb6837f28 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 
* commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 17:00:07 +00:00
Elliott Hughes
e37f3af76d am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
* commit '5cd79d070828b79d8b7d4ecdc3bdbf862866ac9a':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 17:00:01 +00:00
Olawale Ogunwale
07bb03c423 Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 2014-12-18 16:55:43 +00:00
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Narayan Kamath
ddd11793a2 Build against libphonenumber-platform. 
Don't compile libphonenumber sources directly.

Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8
 2014-12-18 13:26:03 +00:00
Douglas Leung
7e7c603182 Add mips64 support to app_process. 
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
 2014-12-17 20:27:25 -08:00
Elliott Hughes
9962ed5575 am 93241de7: Merge "Remove a bitrotted test." 
automerge: ba6982a

* commit 'ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd':
  Remove a bitrotted test.
 2014-12-18 02:40:10 +00:00
Michael Runge
647beed622 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 
automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA
 2014-12-18 01:59:10 +00:00
Rich Slogar
3a586c032c am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a 
automerge: bdc1a3d

* commit 'bdc1a3d03a8dee874e782dc9e2423571cce70406':
  docs: sdk revision 24.0.2
 2014-12-18 01:57:51 +00:00
Eric Gilmore
982e5eb365 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f 
automerge: 65e7a2b

* commit '65e7a2b74f2f01da74ae0c13ada1841b24ea5cf7':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:56:40 +00:00
Pavel Zhamaitsiak
11603bebfa am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 
automerge: a0fc9f2

* commit 'a0fc9f2dd1820611295c6f83efec60c2a8f37eee':
  IMS: Set phone account in IMS Conference object
 2014-12-18 01:55:06 +00:00
Michael Runge
8deabad541 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 
* commit '37fed329adec7b339755fde0b38c687f70524e4e':
  Increase timeout when uncrypting OTA
 2014-12-18 01:53:26 +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
bdc1a3d03a am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a 
* commit '6dfc3aab025579d0472d99fc80a1a6af0703240b':
  docs: sdk revision 24.0.2
 2014-12-18 01:42:45 +00:00
Eric Gilmore
65e7a2b74f am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f 
* commit '2195f58301824d995959eafab76ddc630bd0344e':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:42:40 +00:00
Pavel Zhamaitsiak
a0fc9f2dd1 am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 
* commit '3a35934540060441bc9f80cdf86b5013722553e2':
  IMS: Set phone account in IMS Conference object
 2014-12-18 01:34:21 +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
Sanket Padawe
8c3b1021ba am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '1e63f414ea7ecbe712e8b0dc493bb329f93e6031':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:54:48 +00:00
Rich Slogar
879cffdec9 am 8838a9f0: docs: sdk revision 24.0.2 
* commit '8838a9f083ff2ecc748d70931e21cbd429ad0d45':
  docs: sdk revision 24.0.2
 2014-12-18 00:51:56 +00:00
Sanket Padawe
1e63f414ea am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '776164da3cd5f64de009f75f9530953fadd8626a':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:48:48 +00:00
Sanket Padawe
776164da3c Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 2014-12-18 00:44:08 +00:00
Rich Slogar
8838a9f083 docs: sdk revision 24.0.2 
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
 2014-12-17 16:40:53 -08:00
vandwalle
72e1d3f538 add debug logs to confirm network flapping issue is fixed 
Bug:18706288

Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
 2014-12-17 16:38:58 -08:00
Elliott Hughes
ba6982a16c am 93241de7: Merge "Remove a bitrotted test." 
* commit '93241de734c3b9cf20e8e8956e6f6ccacc5b5ef2':
  Remove a bitrotted test.
 2014-12-18 00:37:51 +00:00
Elliott Hughes
93241de734 Merge "Remove a bitrotted test." 2014-12-18 00:32:01 +00:00
Elliott Hughes
988fd73499 Remove a bitrotted test. 
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
 2014-12-17 16:29:04 -08:00
Winson Chung
a4fe261ec0 am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit '9f48e3160f2768d3322670cbbcc606c9eef76bad':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:26:16 +00:00
Winson Chung
9f48e3160f am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit 'e2ed349cfa838223160e83be7df144e2265cdce4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:18:53 +00:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00