Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,148 Commits 3 Branches 0 Tags
f2e59c0eb755e8b012af34255ccaf50e0f256da3
Commit Graph

156148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
f2e59c0eb7 am 234703b3: Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev 
* commit '234703b3a1d2477b38be9402e69652ecaee6ee68':
  MR1 - Adding more Telecom state dumping.
 2014-10-15 15:21:23 +00:00
Tyler Gunn
234703b3a1 Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev 2014-10-15 15:15:25 +00:00
Jinsuk Kim
18279da701 am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
* commit 'f55cdab4bf9f9206d77748d0774065dc8438af0f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 07:22:15 +00: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
92ab2748ef am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '4d526bd249d720ef8dc54b8c7ecef9953e5be5c7':
  Start cross profile intents as caller.
 2014-10-15 03:06: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
f38b9c2e9f am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit '0e58b6abbe36af3777c3e57cd34828fa2cd684ba':
  Fix a NPE in device policy manager service.
 2014-10-15 00:19:36 +00: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
ba4bbe79c2 am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit '6f1edae88c3f6cfa2e9c046cf77658154640ba7a':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 00:01:31 +00:00
Craig Mautner
6211065723 am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit 'b99419aa1900770c31b76292f6401fe74bd8d671':
  Add null check
 2014-10-14 23:56:12 +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
Tom Taylor
ec10c016cc am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 
* commit 'e1b2fc5c2aee6d42f687f6a8dac2b41a735d39b8':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-14 23:33:48 +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
a4ef863c75 am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 
* commit 'f4d065e5867eda35f13c13dd9e979d1bc3d78e8a':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
 2014-10-14 23:12:22 +00:00
Winson Chung
c6fe2b5193 am db8d39f8: Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 
* commit 'db8d39f8e3fd36e7b2c325240e5afa3efd580b2a':
  Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)
 2014-10-14 23:12:16 +00:00
Jason Monk
417bc6cc5f am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit '68cb9fccc09c4ca13beb52a3bc7e385e8a7064f3':
  Update screen pinning and recents strings to say Overview
 2014-10-14 23:11:58 +00:00
Winson Chung
29d82bbfc9 am 799819af: Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 
* commit '799819af74b7e82536be54c4ed1a46c08647f27b':
  Removing unused/dead code related to footer and screenshot transition.
 2014-10-14 23:11:53 +00:00
Alan Viverette
eecfb52ad5 am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit '9a00cbcc66b5b0002ff78507a1dc1efa12e84d63':
  Update preload list, clean up drawable theming
 2014-10-14 23:11:47 +00:00
Winson Chung
744d25e0e3 am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 
* commit '669eef661de138fa674e69f9b840570300f9bd5d':
  Adding mouse wheel support. (Bug 17323718)
 2014-10-14 23:11:41 +00:00
Selim Cinek
4c8ce9f22d am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '8da1ef2f5f2b557eb15b245f8e8bb5bc3c821f39':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 23:11:34 +00:00
Ricardo Cervera-Navarro
96400c7f93 am 8df05a58: 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 '8df05a5892ec7a8fe3777a167b9465b86994d53c':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 23:11:30 +00:00
Jeff Hao
8225e09155 am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit '59ba1132412d833b1807f53ba419a4d633ae18fb':
  Backport of ordering apps for boot dexopt.
 2014-10-14 23:11:25 +00:00
Svetoslav
a23ad0b7dd am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '0c8e15c016efa64cc8db6a1f1fbcade34543cf3f':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 23:11:11 +00:00
Filip Gruszczynski
e5a8dd222a am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit '3d5ecf13e01da262b95ff78486297af3a0601d0c':
  Prevent index out of bounds when using String.substring.
 2014-10-14 23:03:07 +00:00
Amith Yamasani
6c0659e0eb am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '207913387111b148f84a956ff968200512c5fb78':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 23:03:02 +00:00
Dianne Hackborn
3c5a70e031 am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit 'f23b29ad5a730c7b26d9f96c764dc4e0d96fdd16':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 23:02:41 +00:00
Filip Gruszczynski
f16d226460 am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit '31278350b9fe72f00030f43108868b563948ca73':
  Log wallpaper crashes.
 2014-10-14 23:02:36 +00:00
Rich Slogar
cdfa492e24 am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'b42cd3831bee6023689cd4a5eff05e7a935786f8':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 23:02:11 +00:00
Nick Kralevich
55bb6a7b68 am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '01edf5791cfd63513049c49a673176b0f0809dc1':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 23:02:06 +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