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

155069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Hill
8c13d83e5f am a5380d96: am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network 
* commit 'a5380d9664f89a8f46165e4186eb023f8f392301':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
 2014-10-15 16:32:46 +00:00
Tony Hill
a5380d9664 am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network 
* commit '8e0297155075f9772dd6e8b8194da074dca008f8':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
 2014-10-15 16:27:28 +00:00
Jeff Davidson
074c5b5b65 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev 2014-10-15 15:49:26 +00:00
Tyler Gunn
234703b3a1 Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev 2014-10-15 15:15:25 +00:00
Tony Hill
8e02971550 Do not show roaming icon for BT Mobile SIM camped on EE UK network 
Bug: 17986042
Change-Id: Ia9802c12363bbe6e93cf0b2e524351b6a3f4871c
 2014-10-15 08:03:03 -07:00
Jinsuk Kim
f55cdab4bf resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
Change-Id: Ic0693b6f2fdb2ea32a280297624b1fe435385deb
 2014-10-15 14:55:57 +09:00
Jinsuk Kim
f9a924ab81 am 5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 
* commit '5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 05:16:12 +00:00
Jinsuk Kim
5873c3e862 Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 2014-10-15 05:11:00 +00:00
Jeff Sharkey
4d526bd249 am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
  Start cross profile intents as caller.
 2014-10-15 02:19:26 +00:00
Jeff Sharkey
cf2c564987 am 97978808: Start cross profile intents as caller. 
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
 2014-10-15 02:05:56 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller. 
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
 2014-10-14 17:57:28 -07:00
Svetoslav
0e58b6abbe am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit '1a55dcceaa37d224312ab4b3e4ee31034fa3636d':
  Fix a NPE in device policy manager service.
 2014-10-15 00:13:03 +00:00
Svetoslav
1a55dcceaa am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit 'dc876b56217c588596661ca514b4bdb8a6cfe843':
  Fix a NPE in device policy manager service.
 2014-10-15 00:07:27 +00:00
Svetoslav
dc876b5621 Merge "Fix a NPE in device policy manager service." into lmp-dev 2014-10-15 00:02:59 +00:00
Alan Viverette
6f1edae88c Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 2014-10-14 23:52:23 +00:00
Jinsuk Kim
eaab72ac41 DO NOT MERGE CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
 2014-10-14 23:49:57 +00:00
Craig Mautner
b99419aa19 am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit '27f80673a0bc8997a8f878d2a062defd0f43379e':
  Add null check
 2014-10-14 23:46:22 +00:00
Craig Mautner
27f80673a0 am ea496644: Merge "Add null check" into lmp-dev 
* commit 'ea4966442cd035e592aa73c0c29225efe3f091fb':
  Add null check
 2014-10-14 23:41:26 +00:00
Craig Mautner
ea4966442c Merge "Add null check" into lmp-dev 2014-10-14 23:35:35 +00:00
Craig Mautner
29c58cad4e Add null check 
Unable to examine bugreports that die in the middle of dump().

Help for bug 17721767.

Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
 2014-10-14 16:17:06 -07:00
Tom Taylor
e1b2fc5c2a Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 2014-10-14 23:15:10 +00:00
Winson Chung
f4d065e586 Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 2014-10-14 22:54:14 +00:00
Winson Chung
ca8686af74 Fixing regression with screen pinning button not animating for the first task. (Bug 17985087) 
Change-Id: I81b8b5d6521c99023bbaf903d1bfb95015fbe756
 2014-10-14 15:53:45 -07:00
Svetoslav
28433dbdab Fix a NPE in device policy manager service. 
It is possible that the device does not have an owner. If there
is no owner we get a NPE when asking the device policy manager
for cross-profile widget providers.

bug:17989189

Change-Id: I5759f2dec160ed8076ab47fdf09134f78c57458d
 2014-10-14 15:53:17 -07:00
Winson Chung
db8d39f8e3 Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 2014-10-14 22:53:05 +00:00
Winson Chung
38e957153c Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770) 
Change-Id: Ie94d485580db271256581e2a9f277fe38387d45c
 2014-10-14 15:52:16 -07:00
Jason Monk
68cb9fccc0 am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit 'a1a0131a4adf8fa701a6a25488e1eb13f82dc2c2':
  Update screen pinning and recents strings to say Overview
 2014-10-14 22:51:48 +00:00
Winson Chung
799819af74 Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 2014-10-14 22:50:31 +00:00
Alan Viverette
9a00cbcc66 Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 2014-10-14 22:47:43 +00:00
Jason Monk
a1a0131a4a am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit 'f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
  Update screen pinning and recents strings to say Overview
 2014-10-14 22:47:21 +00:00
Winson Chung
669eef661d Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 2014-10-14 22:47:13 +00:00
Jason Monk
f97e71a6dd Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 2014-10-14 22:42:55 +00:00
Selim Cinek
8da1ef2f5f am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '351ec77ba5685e8bad16df87284d9d3aaac159a1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:37:21 +00:00
Ricardo Cervera-Navarro
8df05a5892 am ac293d16: am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'ac293d16b750e300da44f543ca6bd5b8d01e2b08':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:37:16 +00:00
Jeff Hao
59ba113241 am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit '1201d2a018c85e9c5092e670b334cc4ed4ebcaef':
  Backport of ordering apps for boot dexopt.
 2014-10-14 22:37:03 +00:00
Selim Cinek
351ec77ba5 am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit 'cedb6dc7f2e19120d6889bc681d143bfb2891b80':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:31:27 +00:00
Ricardo Cervera-Navarro
ac293d16b7 am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'a4f9c0873f1d414d6721989f44d88de9a1f6d01a':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:31:21 +00:00
Jeff Hao
1201d2a018 am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
  Backport of ordering apps for boot dexopt.
 2014-10-14 22:31:16 +00:00
Selim Cinek
cedb6dc7f2 Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 2014-10-14 22:28:25 +00:00
Ricardo Cervera-Navarro
a4f9c0873f am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:27:21 +00:00
Svetoslav
0c8e15c016 am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '60cdb909304f0d4b93a1a17228bdcc888f16cf41':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:21:45 +00:00
Ricardo Cervera-Navarro
c93723bdf9 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '7668aa27999e5650fe8776853565f792311fb57d':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:20:02 +00:00
Svetoslav
60cdb90930 am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '0a1ffdb3f89705eeeb89349fcd31c82b2d15b0a5':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:15:26 +00:00
Ricardo Cervera-Navarro
7668aa2799 am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'aa7bcf140d95049f1482c896b770de7ba339f7c9':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:14:16 +00:00
Filip Gruszczynski
3d5ecf13e0 am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.
 2014-10-14 22:04:05 +00:00
Amith Yamasani
2079133871 am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 22:04:01 +00:00
Jeff Hao
dbfbb17512 Backport of ordering apps for boot dexopt. 
This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
   (cherry picked from commit 65cde7d42d741c7d9aa2714a397b7333f688ab55)

2. Improve priority ordering of apps when performing boot dexopt.
   Added core apps and updated system apps.
   (cherry picked from commit 272bf3a274daff62995caf05da338c1f2a73dae3)

3. Stop boot dexopt when low on memory.
   (cherry picked from commit 1d892dcb6b0ff3a50cc63e387667dc29baf1014f)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
 2014-10-14 15:02:37 -07:00
Ricardo Cervera-Navarro
aa7bcf140d Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs 2014-10-14 21:59:48 +00:00
Svetoslav
0a1ffdb3f8 Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 2014-10-14 21:56:31 +00:00
Tom Taylor
790ac852b3 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
Bug 17969135 

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
 2014-10-14 21:45:22 +00:00