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

125420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
362d2718ab am b3f38c63: Merge "Fix issue #13095629: Device is in restart mode for long time..." 
* commit 'b3f38c6398d7f493ee50656a8728acee2c0671f6':
  Fix issue #13095629: Device is in restart mode for long time...
 2014-02-19 11:12:47 -08:00
Chris Craik
0f750eb306 am 66d792b6: Merge "Make outline and shadow APIs public" 
* commit '66d792b6631a8dfd0dd0b7abc75077760fa083cc':
  Make outline and shadow APIs public
 2014-02-19 11:12:43 -08:00
Dianne Hackborn
b3f38c6398 Merge "Fix issue #13095629: Device is in restart mode for long time..." 2014-02-19 18:57:50 +00:00
Dianne Hackborn
00e2521d2a Fix issue #13095629: Device is in restart mode for long time... 
...during taking OTA

Add some sanity checks.

Change-Id: I6bec1b8d8443c4b3c2a706635acf89c8e5051428
 2014-02-19 10:49:24 -08:00
Sailesh Nepal
d309d5f602 Merge commit 'a269eca8' into manualmerge 2014-02-19 10:18:07 -08:00
Chris Craik
66d792b663 Merge "Make outline and shadow APIs public" 2014-02-19 18:11:46 +00:00
Sailesh Nepal
a269eca846 Merge "Delete Third Party Call APIs" 2014-02-19 18:08:59 +00:00
Craig Mautner
1f9820f011 am 08c9db73: am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '08c9db7363a45e2e86f3f69f52758c37775cea7e':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:39:34 -08:00
Narayan Kamath
563d7fad39 am dfc1ef92: am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit 'dfc1ef92557be5565469a2fc8b075f46dc3b4948':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:39:32 -08:00
Craig Mautner
08c9db7363 am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:37:07 +00:00
Narayan Kamath
dfc1ef9255 am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '29596ac2baef37de4cfed494cd740de8d1090899':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:37:03 +00:00
Craig Mautner
6ed1c96b72 am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit 'a1baf0288407c17737cf92bba5c7fccb8c8c55ed':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:34:03 +00:00
Narayan Kamath
29596ac2ba am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '41dd75f8135cd50ba2d38690ce8b05f30964f6e7':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:34:01 +00:00
Craig Mautner
a1baf02884 am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:29:01 +00:00
Narayan Kamath
41dd75f813 am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:28:56 +00:00
Craig Mautner
23ef1b5e0b am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:26:15 -08:00
Narayan Kamath
96ddea413d am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '7c710936c5129664f8b23bf4592c12eca975d229':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:26:07 -08:00
John Spurlock
65d84b1da3 am ed0cd0c3: Merge "Don\'t call back into AM to get current user." 
* commit 'ed0cd0c38d234a61b7c20ef434ff0449edf98304':
  Don't call back into AM to get current user.
 2014-02-19 08:21:08 -08:00
John Spurlock
ed0cd0c38d Merge "Don't call back into AM to get current user." 2014-02-19 16:17:31 +00:00
Craig Mautner
16ea3e6a5b Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 2014-02-19 15:36:01 +00:00
John Spurlock
4355a533bc Don't call back into AM to get current user. 
Bug:13079471
Change-Id: I733d6e3c41c91008406261eac827e6b65bb400db
 2014-02-19 09:49:25 -05:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00
John Spurlock
176b211554 am 78702119: am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '7870211955631c8e1b3c1932c7c8a46b5c1c9fd5':
  Fix bad @links in PendingIntent.java
 2014-02-19 06:07:20 -08:00
John Spurlock
7870211955 am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '14833719e16536ad86943a15ced0d1cb00b65200':
  Fix bad @links in PendingIntent.java
 2014-02-19 14:00:31 +00:00
John Spurlock
14833719e1 am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '01573b5011e777405ba7467678c3083cd03f6968':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:57:21 +00:00
John Spurlock
01573b5011 am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '469301f7edf2201fdbac217fb0ae49652fa9466c':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:54:13 +00:00
John Spurlock
469301f7ed am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:51:00 +00:00
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:47:52 +00:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java 
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:44:14 +00:00
Calin Juravle
d48a4b8da8 am 2f825260: am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '2f825260f69c47cd61f2e85f4c2fd7869bc1f212':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 03:34:34 -08:00
Calin Juravle
2f825260f6 am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit 'fbd855cb60fc3b7e219ead013511a51d17a4482d':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 11:31:17 +00:00
Calin Juravle
fbd855cb60 am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '78f522d16e6e0305c61d13d8ca5dd75c792420c8':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 11:27:58 +00:00
Calin Juravle
78f522d16e am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 11:21:58 +00:00
Calin Juravle
7a4172d190 am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit 'f11cc165f4d6e18d79ce013fa2f74fb43e002ac1':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 03:18:06 -08:00
Calin Juravle
f11cc165f4 Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 2014-02-19 11:15:00 +00:00
Junu Kim
fcb87369b1 A background started service is removed from mStartingBackground when timeout. 
Fix is to make sure mStartingBackground is updated to remove one.

Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
 2014-02-19 16:25:21 +09:00
Jean Chalard
a506f6f4e1 am ca7d37bd: Merge "Fix a crash where user data was not validated." 
* commit 'ca7d37bd270addab2fb764c86b56792bc9349730':
  Fix a crash where user data was not validated.
 2014-02-18 20:14:38 -08:00
Jean Chalard
ca7d37bd27 Merge "Fix a crash where user data was not validated." 2014-02-19 03:18:32 +00:00
Dan Sandler
effc413537 am 83b34efe: Merge "Make some notifications public (safe for secure lockscreens):" 
* commit '83b34efe9e7ae803e213889d67f01032282e1614':
  Make some notifications public (safe for secure lockscreens):
 2014-02-18 18:28:34 -08:00
Dan Sandler
e515b32dcd am 6c306b8e: Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 
* commit '6c306b8e4e1cd1bf303c58676148378116b2e396':
  Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-02-18 18:28:31 -08:00
Dan Sandler
83b34efe9e Merge "Make some notifications public (safe for secure lockscreens):" 2014-02-19 02:26:12 +00:00
Dan Sandler
6c306b8e4e Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 2014-02-19 02:26:02 +00:00
Dianne Hackborn
e995786f46 am bffeb4fa: Merge "Fix issue #13065185: Frequent runtime restarts on launching..." 
* commit 'bffeb4faf71706f965e6f845ac34b36e133a96d8':
  Fix issue #13065185: Frequent runtime restarts on launching...
 2014-02-18 18:01:39 -08:00
Dianne Hackborn
bffeb4faf7 Merge "Fix issue #13065185: Frequent runtime restarts on launching..." 2014-02-19 01:58:29 +00:00
Dianne Hackborn
dfc60ec523 Fix issue #13065185: Frequent runtime restarts on launching... 
..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Ic92a6e7bcc24b01aeef5f97f994f105d5e11ea7f
 2014-02-18 17:42:55 -08:00
Fabrice Di Meglio
b8b54bc69c am c39d3d32: Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 
* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9':
  Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
 2014-02-18 17:19:09 -08:00
Fabrice Di Meglio
c39d3d32ab Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 2014-02-19 01:14:46 +00:00
Fabrice Di Meglio
494440be14 Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 
This reverts commit 08189afdb02af22991184bddba74d5402ea7720f.

Change-Id: Ie8797daca642685ee9a2a541d11a35daa28f0564
 2014-02-19 01:11:21 +00:00
Sailesh Nepal
f86a9221a4 Delete Third Party Call APIs 
Change-Id: I6121c53362804a228e0316a1666b5032817530ab
 2014-02-18 17:04:10 -08:00
Chris Craik
e9b8817bd7 Make outline and shadow APIs public 
Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
 2014-02-18 16:55:45 -08:00