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

163056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page 
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
 2014-10-14 19:39:11 -07:00
Svetoslav
1024e3a061 am f38b9c2e: am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit 'f38b9c2e9f03fe8e361d310271a842badf754620':
  Fix a NPE in device policy manager service.
 2014-10-15 02:30:33 +00:00
Alan Viverette
db2031e215 am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit 'ba4bbe79c2610bd4c0525837ad6654e0e36fd32d':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 02:30:22 +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
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 02:15:35 +00:00
Craig Mautner
1d1ebed338 am 62110657: am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit '6211065723d22048694b4854c904683c4ba86268':
  Add null check
 2014-10-15 02:10:44 +00:00
Tom Taylor
a51fa5dd9c am ec10c016: am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 
* commit 'ec10c016cc082eb79c6ebc61505f4c0c6d1f179d':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 02:09:03 +00:00
Winson Chung
cbd99dd853 am a4ef863c: am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 
* commit 'a4ef863c753e6756027c44a539ac02144ce614f9':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
 2014-10-15 02:08:01 +00:00
Winson Chung
c0faa99307 am c6fe2b51: am db8d39f8: Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 
* commit 'c6fe2b519316e7d234b303d0511fbaffc7f0be3b':
  Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)
 2014-10-15 02:07:54 +00:00
Jason Monk
048a2d3c71 am 417bc6cc: am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit '417bc6cc5fdfc6f5c80016cf1b848268605acf11':
  Update screen pinning and recents strings to say Overview
 2014-10-15 02:07:48 +00:00
Winson Chung
c76ad871ba am 29d82bbf: am 799819af: Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 
* commit '29d82bbfc9f91ff87f7d71220f831e351bd2c0da':
  Removing unused/dead code related to footer and screenshot transition.
 2014-10-15 02:07:41 +00:00
Alan Viverette
6ee5699b22 am eecfb52a: am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit 'eecfb52ad56a3bb4f5bf2cdaeb83cfe8b33fa0c1':
  Update preload list, clean up drawable theming
 2014-10-15 02:07:34 +00:00
Winson Chung
1a97602f14 am 744d25e0: am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 
* commit '744d25e0e3b75c8beba6f9a8e94d949b8f21d922':
  Adding mouse wheel support. (Bug 17323718)
 2014-10-15 02:07:28 +00:00
Selim Cinek
9f6c886717 am 4c8ce9f2: am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '4c8ce9f22db9900594844e4e1206865c601f77d1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-15 02:07:21 +00:00
Ricardo Cervera-Navarro
8b58a391a1 am 96400c7f: 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 '96400c7f93827a78468d2b2f7f22833ae3353152':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-15 02:07:14 +00:00
Jeff Hao
c2b90f06d4 am 8225e091: am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit '8225e0915534c2c347bf2deeec0f903714ed2c04':
  Backport of ordering apps for boot dexopt.
 2014-10-15 02:07:09 +00:00
Svetoslav
4e3b2426ac am a23ad0b7: am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit 'a23ad0b7dd159e7fb0e8c2ff6b86683c7da6225e':
  Handle if the printing app is killed while saving to PDF.
 2014-10-15 02:07:02 +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
Filip Gruszczynski
6a0cebca80 am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit 'e5a8dd222ab31d63c4f38fd87f909264f024530d':
  Prevent index out of bounds when using String.substring.
 2014-10-15 02:04:13 +00:00
Amith Yamasani
d060a29e52 am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-15 02:04:06 +00:00
Dianne Hackborn
133c747e10 am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:03:59 +00:00
Filip Gruszczynski
38afe56204 am f16d2264: am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit 'f16d226460cbe0800d8c3b614121cd8c09bdc9cb':
  Log wallpaper crashes.
 2014-10-15 02:03:51 +00:00
Rich Slogar
d1baa50d4f am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'cdfa492e2420d97177f32a77e177bb7ba0c5ebb3':
  docs:SDK tools 23.0.5 Release Note
 2014-10-15 02:03:44 +00:00
Nick Kralevich
a26487cb28 am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-15 02:03:37 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script 
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
 2014-10-14 19:03:08 -07:00
Craig Mautner
1559d9d15f DO NOT MERGE Add empty ArrayList check. 
Fixes bug 15768779.
Fixes bug 17955259.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
 2014-10-15 01:30:10 +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
Andrew Lee
52d65739ad Add helper method for checking phone capabilities. 
I'm figuring this can help standardize phone capability checks when
need to do all over the place.

Bug: 17429707
Change-Id: I97327fd08158de3c18d186b6092597a1d4abcf14
 2014-10-14 16:56:11 -07: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
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt' 
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
 2014-10-14 16:26:11 -07: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