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

155641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
36960fad66 Merge "Decoder only returns true on complete success." into lmp-mr1-dev 2014-10-22 21:53:07 +00:00
xin He
4329f15b50 am 265e3da0: am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '265e3da00668a0769be331349541050dd6603c2b':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 21:22:18 +00:00
Ricardo Cervera
2b8f9f87ff am e9438c7b: am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit 'e9438c7b17caf0253427031a010456f594741616':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 20:48:39 +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
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
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
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
xin He
265e3da006 am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '5085c4c2933219831bde11a482c8b2934e4a259f':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 17:22:51 +00:00
xin He
5085c4c293 Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 2014-10-22 17:19:26 +00:00
Ricardo Cervera
e9438c7b17 am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit '0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 17:06:56 +00:00
Ricardo Cervera
0ae6e37e64 Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 2014-10-22 17:03:44 +00: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
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
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
c9e4f94227 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-22 15:53:02 +00:00
Geoff Mendal
9b67a1a232 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 15:49:33 +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
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
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
3961d2af80 Import translations. DO NOT MERGE 
Change-Id: I9d15256733ff57735cfe6a07855a6633d732464c
Auto-generated-cl: translation import
 2014-10-22 06:20:08 -07:00
Craig Mautner
4816ed65c6 Merge "Debug for bug 18017409" into lmp-mr1-dev 2014-10-22 03:01:41 +00:00
Leon Scroggins III
754bffe969 am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit 'e463bc388e7f5d83f864b320dde400e390ef5817':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 02:00:46 +00:00
Robin Lee
de7df08cda am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'fc56790085463ab410a5f407a4930b42509ad5f7':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-22 02:00:38 +00:00
Dongwon Kang
a6372b3be4 Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 2014-10-22 01:46:33 +00:00
Deepanshu Gupta
37779f0749 Merge "Check Bridge init before disposing." into lmp-dev 
automerge: 568f16c

* commit '568f16ccfbe95d5a68e3e3a732565a1063d5160e':
  Check Bridge init before disposing.
 2014-10-22 01:17:32 +00:00
Jinsuk Kim
07b481a9f7 Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev 
automerge: 0c74939  -s ours

* commit '0c74939024cb2aec9e8348808366170d77d6e8e7':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 01:16:26 +00:00
Craig Mautner
5a3c231dc8 Debug for bug 18017409 
Log adding and removing windows. Log activity state changes.

Change-Id: I544be89ff9af6b13ffde70dedec291793b46a420
 2014-10-21 18:15:20 -07:00
Deepanshu Gupta
568f16ccfb Merge "Check Bridge init before disposing." into lmp-dev 2014-10-22 00:57:34 +00:00
Alan Viverette
bb852b0b6b Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 2014-10-22 00:35:29 +00:00
Alan Viverette
13e13ddd4e Format ListPreference summary with empty string if entry is null 
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.

BUG: 17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
 2014-10-21 17:05:07 -07:00
Wale Ogunwale
be23ff4949 Fix issue #17674789: Recents icon resets if persist mode is 'persistNever' 
Changed TaskPersister worker thread to not delete task information on disk
for tasks that are in recents but not persistable.

Also, changed logic that writes tasks information (excluding thunmbnail)
to disk to not write information for tasks that are not persistable.

Bug: 17674789
Change-Id: Iff7c5d24677f8a75157bb6be504fc2d9d6bcc098
 2014-10-21 16:47:58 -07:00
Santos Cordon
40f1589544 am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '028217eb6789e82c96ef5ff5fe0a5a9e0c740d97':
  Add hidden method to access a connection's service.
 2014-10-21 23:29:41 +00:00
Jinsuk Kim
0c74939024 Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev 2014-10-21 23:25:58 +00:00
Santos Cordon
028217eb67 Merge "Add hidden method to access a connection's service." into lmp-dev 2014-10-21 23:22:02 +00:00