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

178810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xinhe
661a988869 am eee6db9f: am ffe80ab7: Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev 
automerge: b3da912

* commit 'b3da912b516cc590cfd6bd898147d9806711494f':
  take out SIM card, the RSSI Triangle is still full
 2014-12-19 03:54:43 +00: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
057d21e207 am 4ad35f9c: am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 
automerge: 6f2ea24

* commit '6f2ea24086be9eb9650aa647c25843d9371c77f7':
  BluetoothManagerService: Enforce DUMP permission
 2014-12-18 22:45:59 +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
John Reck
c21e364386 Merge "Stop pretending USE_OPENGL_RENDERER is a thing" 2014-12-18 22:42:13 +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
Mike Lockwood
8a0399c442 Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 2014-12-18 22:34:00 +00:00
vandwalle
1c9c3f4e9b am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
automerge: 67878bb

* commit '67878bb5ea8b4cc873a25ab577a94a8d6f122dc1':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:28:38 +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
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
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
John Reck
a2732a2bf9 Stop pretending USE_OPENGL_RENDERER is a thing 
Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
 2014-12-18 14:12:27 -08:00
Craig Mautner
6c13f5921d am 2eb575b4: am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
automerge: 4ed8a33

* commit '4ed8a336efc76847fbf3e11a0ae66aa74c422846':
  Make window mgr stack movement track activity mgr
 2014-12-18 21:57:36 +00:00
Winson Chung
f69fe23bff am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
automerge: 5d40d0b

* commit '5d40d0b645e31063d08e304e4ba2880b267234b9':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:56:20 +00: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
John Reck
536fbce41d Merge "Split hwui's makefile" 2014-12-18 21:40:16 +00:00
John Reck
35cf58ab28 Split hwui's makefile 
Change-Id: I7ad1a692e708cad052e8ca5b412c17e25992862c
 2014-12-18 13:14:40 -08:00
Jeff Hao
a6ad625cc7 am e06184e4: Merge "Add mips64 support to app_process." automerge: 51bdc62 
automerge: 093dad2

* commit '093dad2a47aed9f16fd4190af4b3070b49b982f1':
  Add mips64 support to app_process.
 2014-12-18 21:04:52 +00:00
Alex Klyubin
bdd637a3ff am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." automerge: e48aec9 
automerge: 22810c4

* commit '22810c4d171a1057bd2f36cb62664a242e7be0b9':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 21:03:25 +00:00
Olawale Ogunwale
b0767c8c35 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." automerge: 5cb6837 
automerge: a96b61d

* commit 'a96b61d931df00ab5744c53a87008a9cce461329':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 21:02:00 +00:00
Elliott Hughes
496894b0e1 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af 
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 21:00:53 +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
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
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
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
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
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
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
Mike Reed
f2883b320f explicitly call tryAllocPixels if you want to check for failure 
allows us to remove SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL

Change-Id: I095a04e358404bc413ceebe81e7e1adfbbbec027
 2014-12-18 16:47:08 +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
fcc0788419 am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a 
automerge: 9962ed5

* commit '9962ed55759336642cfaba27e8b2a47822f562fe':
  Remove a bitrotted test.
 2014-12-18 02:42:27 +00:00