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

156908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
a4215870d7 am fd32fec2: am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'fd32fec2ca4fc86b5361556e0903f3beaad8a650':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 21:07:07 +00:00
John Reck
d83fc233bd am 7c8f44ae: am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '7c8f44ae529ce32356d83e92c26d9ba62be3298c':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 21:07:01 +00:00
Geoff Mendal
1d8d6fdd2c am 80d812b9: (-s ours) am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '80d812b9b5cac86d74d8de6d72c83462c78087ba':
  Import translations. DO NOT MERGE
 2014-10-22 21:06:57 +00:00
Geoff Mendal
24acd22f58 am 4bfba71f: (-s ours) am b571b926: (-s ours) Import translations. DO NOT MERGE 
* commit '4bfba71f8b462e3f67eee61f47f8ec02388847f2':
  Import translations. DO NOT MERGE
 2014-10-22 21:06:53 +00:00
Deepanshu Gupta
22387d9d35 am 01c80f15: am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '01c80f155d095ccd77a5f3038d4d02663219684e':
  Check Bridge init before disposing.
 2014-10-22 21:06:49 +00:00
Jinsuk Kim
e02ae4843e am 9ad6a471: am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c74939 -s ours 
* commit '9ad6a471867ab713109d1391d8047e0ed0a98442':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 21:06:45 +00:00
Santos Cordon
910f18eae9 am 05f4d8d1: am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466':
  Add hidden method to access a connection's service.
 2014-10-22 21:06:41 +00:00
Filip Gruszczynski
78b236b3d2 am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'd4a52a6878846ba0a69f6c2f814356ceaa4b8ec6':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 21:06:37 +00:00
Guang Zhu
5cd907067d am 871cdeeb: am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '871cdeebdaf9469c97959d90c12e36140bb14f4a':
  Block monkey from creating user profiles
 2014-10-22 21:06:32 +00:00
Adrian Roos
3768d22417 am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit '96d3132bd0c57fbf8bb46624045fa1616452d346':
  Delay discovery of system trust agents
 2014-10-22 21:06:13 +00:00
Quddus Chong
fd32fec2ca am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit '523577213072d63f6775ea3155bfc93080314494':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 20:48:35 +00:00
John Reck
7c8f44ae52 am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '36c2aa4a6394047f02c4f236233b41d738ff56c1':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 20:48:27 +00:00
Geoff Mendal
80d812b9b5 am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c9e4f942276506c25922e0d61a3978cc2b1c9bc6':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:22 +00:00
Geoff Mendal
4bfba71f8b am b571b926: (-s ours) Import translations. DO NOT MERGE 
* commit 'b571b926f00aee176792aedd964de8230c75c401':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:15 +00:00
Deepanshu Gupta
01c80f155d am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '37779f07496462afa4b5d88725e8a004a7e10bc0':
  Check Bridge init before disposing.
 2014-10-22 20:47:37 +00:00
Jinsuk Kim
9ad6a47186 am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c74939 -s ours 
* commit '07b481a9f77a7ac0dc430706aadfa262802cfdba':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 20:47:34 +00:00
Santos Cordon
05f4d8d1d0 am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '40f158954491c4d2587e0b2a13cd07195bc27b25':
  Add hidden method to access a connection's service.
 2014-10-22 20:47:15 +00:00
Filip Gruszczynski
d4a52a6878 am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 20:45:59 +00:00
Guang Zhu
871cdeebda am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c':
  Block monkey from creating user profiles
 2014-10-22 20:45:55 +00:00
Adrian Roos
96d3132bd0 am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit 'c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
  Delay discovery of system trust agents
 2014-10-22 20:45:26 +00:00
Christopher Tate
339f0a57d4 am 6ab86274: Merge "Don\'t cancel scheduled jobs when packages are updated" into lmp-mr1-dev 
* commit '6ab862747b913353ff63b7c9bd6c7ddcecb348c6':
  Don't cancel scheduled jobs when packages are updated
 2014-10-22 20:31:05 +00:00
Christopher Tate
6ab862747b Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev 2014-10-22 20:27:15 +00:00
Alan Viverette
5eaf00641a am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit '410f7ee4031bb754600ad9c984158b6ff4f056c8':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:08:02 +00:00
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated 
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
 2014-10-22 11:16:33 -07:00
Christopher Tate
281763ba1b am 04e6827a: Fix settings db update sequence 
* commit '04e6827ace936e0cbb666d8ef94635b73672aa41':
  Fix settings db update sequence
 2014-10-22 18:06:09 +00:00
Christopher Tate
04e6827ace Fix settings db update sequence 
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.

Bug 18069830

Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
 2014-10-22 10:36:42 -07:00
Quddus Chong
5235772130 am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'b8796e441ce8b4f2e2f75df9689637f6e18f18db':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 17:01:51 +00:00
John Spurlock
0c42c69361 am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 
* commit '95dc663d1815704c63a5b18c94c3768068f2ff21':
  PowerUI: Post/cancel notification as UserHandle.ALL.
 2014-10-22 16:48:34 +00:00
Quddus Chong
b8796e441c docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
 2014-10-22 09:45:44 -07:00
John Spurlock
95dc663d18 Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 2014-10-22 16:44:29 +00:00
Ye Wen
9921a1dbb6 am 91590bae: Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 
* commit '91590bae00d2d9d428892a82f3ac556e3f5e779a':
  Send HTTP status code back in case of MMS HTTP failure (1/3)
 2014-10-22 16:42:44 +00:00
Ye Wen
91590bae00 Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 2014-10-22 16:37:00 +00:00
John Reck
36c2aa4a63 Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 2014-10-22 16:25:50 +00:00
Geoff Mendal
9607b858a1 am 9b67a1a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9b67a1a232dc0e1cda346271c3a9d118228001ee':
  Import translations. DO NOT MERGE
 2014-10-22 15:53:11 +00:00
Geoff Mendal
c9e4f94227 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-22 15:53:02 +00:00
Geoff Mendal
1a58505694 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-22 15:51:57 +00:00
Geoff Mendal
9b67a1a232 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 15:49:33 +00:00
Wale Ogunwale
a14f69f5d9 am f7fb3acf: Merge "Fix issue #17674789: Recents icon resets if persist mode is \'persistNever\'" into lmp-mr1-dev 
* commit 'f7fb3acf8fb92890b0a2b9cc0b238e5df80e1cf5':
  Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
 2014-10-22 15:47:44 +00:00
Geoff Mendal
5bf35f39b0 Import translations. DO NOT MERGE 
Change-Id: I478370f6105138f39c9dad5079b7c434fa8078b3
Auto-generated-cl: translation import
 2014-10-22 08:46:41 -07:00
Wale Ogunwale
f7fb3acf8f Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev 2014-10-22 15:43:53 +00:00
Geoff Mendal
0668d7855f Import translations. DO NOT MERGE 
Change-Id: Ica314725654add05e972b189aafc338377faeea8
Auto-generated-cl: translation import
 2014-10-22 08:43:33 -07:00
Geoff Mendal
d56bab2c62 Import translations. DO NOT MERGE 
Change-Id: I1a02d1751579ede64ab9d736fd1450dd0b449bfd
Auto-generated-cl: translation import
 2014-10-22 08:41:58 -07:00
John Reck
2615de920b Surface:lockHardwareCanvas DO NOT MERGE 
Bug: 17440886

Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2

Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
 2014-10-22 08:33:31 -07:00
John Spurlock
ecbc5e828a PowerUI: Post/cancel notification as UserHandle.ALL. 
- Post power-related notifications for all users.
- Update the pending intent actions on user switch.
- Listen for the intent actions for all users.

Bug: 17300571
Change-Id: I956f09ecf5395f31ae1c1ec0409ee251839fcef4
 2014-10-22 10:48:40 -04:00
John Reck
a91c5ca78a am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev 
* commit '733bb3bc78cfb4553441f5d86fce02eb12e32d02':
  Fix memory corruption in test
 2014-10-22 14:21:48 +00:00
John Reck
733bb3bc78 Merge "Fix memory corruption in test" into lmp-mr1-dev 2014-10-22 14:18:21 +00:00
Geoff Mendal
b571b926f0 Import translations. DO NOT MERGE 
Change-Id: Ifca413c79959bf4b6585f0fb9b7a5ed1acf1ec9f
Auto-generated-cl: translation import
 2014-10-22 06:37:04 -07:00
Geoff Mendal
6f26bb5a7f am 3961d2af: (-s ours) Import translations. DO NOT MERGE 
* commit '3961d2af80f4c0285176f2984b35ffe5ee65ba5a':
  Import translations. DO NOT MERGE
 2014-10-22 13:35:09 +00:00
Geoff Mendal
d2c2f9357b Import translations. DO NOT MERGE 
Change-Id: I88792b1fde0623df4fd3684e3647fe7674d60098
Auto-generated-cl: translation import
 2014-10-22 06:24:50 -07:00