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
Joe Fernandez
eed87a573a am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit '09b41c02af691f500667f0e43baf8f4442a0add1':
  docs: project file and toc updates
 2014-12-19 05:40:43 +00:00
Joe Fernandez
609252651f am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
* commit 'afc3b9e7f54034f16df5b2b6ec1f1f7e4f7bdcbc':
  docs: studio build output dir name update
 2014-12-19 05:40:24 +00:00
Joe Fernandez
43f4e8faa6 am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
* commit '27cb0a56589ed6e49a832d6b2ff8bba38eb8cb9d':
  docs: gradle version update in plugin file
 2014-12-19 05:40:21 +00:00
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
tingna_sung
33d8e73920 Fix racing condition of mTouchExcludeRegion 
Copy region from DisplayContent.mTouchExcludeRegion instead of
directly refer to the same object of DisplayContent, and able to
protect it by lock of self class, don't have to lock out mWindowMap
on every tap.

This fix is to avoid racing condition of mTouchExcludeRegion.

Change-Id: I7401968167c2e539b4da2afe71e3020038fbfcbf
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-12-19 13:21:08 +08:00
Joe Fernandez
1092bafa1d Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 2014-12-19 05:20:53 +00:00
tiger_huang
f73883f69d Layout the config-changed window if it has surface 
This patch fixes an issue which caused the resumed app to get the
wrong frame at first.

https://code.google.com/p/android/issues/detail?id=82242

Change-Id: I4483029326afca143e7921f3b9563da4f566d2e5
 2014-12-19 13:19:36 +08:00
xinhe
b3da912b51 am eee6db9f: am ffe80ab7: Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev 
* commit 'eee6db9f4a34d53935271fcabc9a57a1044ba994':
  take out SIM card, the RSSI Triangle is still full
 2014-12-19 03:52:01 +00:00
xinhe
eee6db9f4a am ffe80ab7: Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev 
* commit 'ffe80ab7f68d553fbda221e3457f288a3b7baa0a':
  take out SIM card, the RSSI Triangle is still full
 2014-12-19 03:32:58 +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
Mike Lockwood
6f2ea24086 am 4ad35f9c: am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 
* commit '4ad35f9cc7e8673a0f3d551ef299c753cc244248':
  BluetoothManagerService: Enforce DUMP permission
 2014-12-18 22:44:18 +00:00
Mike Lockwood
4ad35f9cc7 am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 
* commit '8a0399c442522bf2dab20c688a99d92faa01f9b1':
  BluetoothManagerService: Enforce DUMP permission
 2014-12-18 22:40:34 +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
vandwalle
67878bb5ea am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
* commit 'a3c187bc1f97dc098ff939cfe937a482a9bdf7fb':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:26:38 +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
vandwalle
a3c187bc1f am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
* commit 'f87606fe25acff86807ef0514b478359bcb52f84':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:20:27 +00: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
Craig Mautner
4ed8a336ef am 2eb575b4: am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
* commit '2eb575b4b0429d42c14627627d9630ba6056262e':
  Make window mgr stack movement track activity mgr
 2014-12-18 21:53:43 +00:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:53:36 +00: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
Jeff Hao
093dad2a47 am e06184e4: Merge "Add mips64 support to app_process." 
automerge: 51bdc62

* commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6':
  Add mips64 support to app_process.
 2014-12-18 20:58:17 +00:00
Alex Klyubin
22810c4d17 am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." 
automerge: e48aec9

* commit 'e48aec9e7fd8be25ac43a4a6e69b1829f0d57d38':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 20:56:54 +00:00
Olawale Ogunwale
a96b61d931 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 
automerge: 5cb6837

* commit '5cb6837f288e3f1e0ff8f6f9b571a85ebb34bca7':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 20:55:34 +00:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 20:54:28 +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
2eb575b4b0 am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
* commit '2281e7d6a18e4eebea602c8093ec7cb6541f2960':
  Make window mgr stack movement track activity mgr
 2014-12-18 20:26:00 +00:00
Winson Chung
4edaa5e4b6 am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit 'a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 20:25:55 +00:00