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

178989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
87343eff54 am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev 
* commit '28fbe04052b95ada3c32d805f26d6d9ad5548d6b':
  Fix missing subscription list changes
 2014-12-19 15:00:12 +00:00
Jason Monk
28fbe04052 Merge "Fix missing subscription list changes" into lmp-mr1-dev 2014-12-19 14:55:49 +00:00
Leon Scroggins III
1e9547722f Merge "Make SkiaCanvas creation call ref() on SkCanvas." 2014-12-19 14:32:05 +00:00
Leon Scroggins III
0e52410217 Merge "Remove dependence on SK_LEGACY_PICTURE_DRAW_API." 2014-12-19 14:31:45 +00:00
Oliver Woodman
c2597f0e09 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 
automerge: 20e52c3

* commit '20e52c3453b2683cccfc4ac0841c9d6ef0796f88':
  MediaSessionLegacyHelper uses global Application context
 2014-12-19 11:49:15 +00:00
Oliver Woodman
20e52c3453 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 
* commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5':
  MediaSessionLegacyHelper uses global Application context
 2014-12-19 11:47:38 +00:00
Oliver Woodman
9aa5cb76f3 am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 
* commit '69fd01d3e6e8e94eafdb6d424f92a32ada93096d':
  MediaSessionLegacyHelper uses global Application context
 2014-12-19 11:42:17 +00:00
Oliver Woodman
69fd01d3e6 Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 2014-12-19 11:37:04 +00:00
Lorenzo Colitti
3c125575b6 am 7e81cdef: am 7b42f399: Add a lastValidated bit and use it when reporting capabilities. 
automerge: 8af8f1f7

* commit '8af8f1f71e05355d890206517b5518c961a247d4':
  Add a lastValidated bit and use it when reporting capabilities.
 2014-12-19 10:51:18 +00:00
Lorenzo Colitti
f895c8c5c6 am b069e434: am d3b8a3e7: Rename validated to everValidated. 
automerge: b12b29a

* commit 'b12b29a80d0f5b685dad631d2c2de57715438a11':
  Rename validated to everValidated.
 2014-12-19 10:49:24 +00:00
Lorenzo Colitti
8af8f1f71e am 7e81cdef: am 7b42f399: Add a lastValidated bit and use it when reporting capabilities. 
* commit '7e81cdef3625b52642969dd226a1446745e633e8':
  Add a lastValidated bit and use it when reporting capabilities.
 2014-12-19 10:47:26 +00:00
Lorenzo Colitti
b12b29a80d am b069e434: am d3b8a3e7: Rename validated to everValidated. 
* commit 'b069e434cba6dd8f949c3ebe44507da32aef3496':
  Rename validated to everValidated.
 2014-12-19 10:47:20 +00:00
Lorenzo Colitti
7e81cdef36 am 7b42f399: Add a lastValidated bit and use it when reporting capabilities. 
* commit '7b42f399430d5d4ace4efbee225bbd3ecd2d4146':
  Add a lastValidated bit and use it when reporting capabilities.
 2014-12-19 10:41:08 +00:00
Lorenzo Colitti
b069e434cb am d3b8a3e7: Rename validated to everValidated. 
* commit 'd3b8a3e77696ecd90ce59a869aaadf1e7804a9c8':
  Rename validated to everValidated.
 2014-12-19 10:41:03 +00:00
Lorenzo Colitti
7b42f39943 Add a lastValidated bit and use it when reporting capabilities. 
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.

Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().

Bug: 18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
 2014-12-19 19:10:42 +09:00
Lorenzo Colitti
d3b8a3e776 Rename validated to everValidated. 
This is a straight rename and thus a complete no-op from a
functionality perspective.

Bug: 18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
 2014-12-19 19:10:42 +09:00
louis_chang
1110f55470 [ActivityManager] Reset ActivityRecord's waitingVisible 
Symptom:
The ActivityRecord's waitingVisible is not set to false for
all cases when the ActivityRecord is removed from
mStackSupervisor.mWaitingVisibleActivities.

Solution:
Set the waitingVisible to false when it is removed from
mStackSupervisor.mWaitingVisibleActivities

Change-Id: If0f0683971d70a6866b0167e91dd95feebaac178
 2014-12-19 17:30:45 +08:00
Craig Mautner
a1dab74574 am c14a4b10: Merge "Fix racing condition of mTouchExcludeRegion" automerge: 6007d9a 
automerge: 2f5e606

* commit '2f5e606ec511fefe55e4f51b42a623db6a646f85':
  Fix racing condition of mTouchExcludeRegion
 2014-12-19 06:52:55 +00:00
Craig Mautner
2f5e606ec5 am c14a4b10: Merge "Fix racing condition of mTouchExcludeRegion" automerge: 6007d9a 
* commit 'c14a4b10caed67131d656ba5dda5944a52b48c0a':
  Fix racing condition of mTouchExcludeRegion
 2014-12-19 06:50:23 +00:00
Craig Mautner
c14a4b10ca Merge "Fix racing condition of mTouchExcludeRegion" 
automerge: 6007d9a

* commit '6007d9aa5f53685bba47ee63d6b4702b9f802744':
  Fix racing condition of mTouchExcludeRegion
 2014-12-19 06:44:30 +00:00
Craig Mautner
6007d9aa5f Merge "Fix racing condition of mTouchExcludeRegion" 2014-12-19 06:41:27 +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
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
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