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

125397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jay Shrauner
8b9a2278d2 am ae586241: Merge "Prevent SpellChecker from setting invalid range" 
* commit 'ae58624157798ef72be6bcbdaaca7979302e3f7f':
  Prevent SpellChecker from setting invalid range
 2014-02-18 16:27:18 -08:00
Jay Shrauner
ae58624157 Merge "Prevent SpellChecker from setting invalid range" 2014-02-19 00:24:39 +00:00
Marco Nelissen
0b1189fdbc am 940591d9: Merge "Fix regression" 
* commit '940591d92e9e2c858a7b726f8884188866023108':
  Fix regression
 2014-02-18 16:12:18 -08:00
Marco Nelissen
940591d92e Merge "Fix regression" 2014-02-19 00:10:19 +00:00
ztenghui
c9d5ae50ed am 146a1f0c: Merge "Separate spot and ambient shadow strength setting" 
* commit '146a1f0cbcbab9cfead773f684134645edd34b6a':
  Separate spot and ambient shadow strength setting
 2014-02-18 16:08:58 -08:00
Craig Mautner
d942e94842 am 060f509f: am 74304f89: (-s ours) am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 
* commit '060f509f20b56a3d49d86084c9dedf71b6933896':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-18 16:08:56 -08:00
ztenghui
146a1f0cbc Merge "Separate spot and ambient shadow strength setting" 2014-02-19 00:07:28 +00:00
Marco Nelissen
d5a579765e Fix regression 
Don't crash if an item is inserted without a slash in its path.
b/13076381

Change-Id: I5cde2adaa038201e0692af3c8ca92540ce75f083
 2014-02-18 16:06:38 -08:00
Craig Mautner
060f509f20 am 74304f89: (-s ours) am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 
* commit '74304f890e7341d9bb8a6fdadd9e5f4dda60a246':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-19 00:05:50 +00:00
Craig Mautner
74304f890e am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 
* commit '1bf3795798aa462187a8c83220f900f293dfc1ee':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-19 00:02:16 +00:00
Craig Mautner
1bf3795798 am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 
* commit 'db0f3e825fb4da01f887c41a877708734b0899e3':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-18 23:59:42 +00:00
Craig Mautner
db0f3e825f Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 2014-02-18 23:56:53 +00:00
Andy McFadden
4f0a80d0b8 Allow "opaque" flag to be updated. DO NOT MERGE 
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
 2014-02-18 15:54:24 -08:00
Adam Lesinski
5fdcc33963 am 5441745e: am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '5441745effb885589c03050b59885e8a3ad96ad6':
  Create FEATURE_ constants for print and backup
 2014-02-18 15:07:14 -08:00
Adam Lesinski
5441745eff am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
  Create FEATURE_ constants for print and backup
 2014-02-18 23:03:37 +00:00
Adam Lesinski
019b1f2668 am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '2ea983a567bf536f71dd620e1b215d5aeebce531':
  Create FEATURE_ constants for print and backup
 2014-02-18 23:01:06 +00:00
Adam Lesinski
2ea983a567 am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
  Create FEATURE_ constants for print and backup
 2014-02-18 22:57:37 +00:00
Dianne Hackborn
2bbd02bbd8 am 93b55c11: Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 
* commit '93b55c1149bb4a03b0df7887182265969af2ab71':
  Implement wifi part of issue #12973036: Improve power_profile.xml
 2014-02-18 14:47:07 -08:00
Dianne Hackborn
93b55c1149 Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 2014-02-18 22:45:17 +00:00
Dianne Hackborn
ca1bf21c51 Implement wifi part of issue #12973036: Improve power_profile.xml 
Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
 2014-02-18 14:43:14 -08:00
Deepanshu Gupta
c889955009 am f22d01e8: Merge "Fix native methods" 
* commit 'f22d01e8504db1ce56cb8a29531f57d488585793':
  Fix native methods
 2014-02-18 14:42:44 -08:00
Jeff Sharkey
a9e14be38a am 5b12ed57: Merge "Lock down MANAGE_DOCUMENTS permission." 
* commit '5b12ed5746080903c8193fd7ae7d9a092747a4b9':
  Lock down MANAGE_DOCUMENTS permission.
 2014-02-18 14:42:41 -08:00