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

208293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f9230b4e13 Import translations. DO NOT MERGE 
Change-Id: Ifb0916bcd17b16bf412f3370595fab52ab30c035
Auto-generated-cl: translation import
 2015-07-22 05:28:16 -07:00
Elliott Hughes
a4068a3f0b am 1c6d9005: am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit '1c6d9005d30ef3f9cc30fb89e78751b7033a453f':
  aapt: expat exports its header files now.
 2015-07-22 01:40:49 +00:00
Elliott Hughes
1c6d9005d3 am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.
 2015-07-22 01:26:20 +00:00
Elliott Hughes
f9a8221810 am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit '86d5fc2874b4c17bd4f48ae307e49ba8108e11f0':
  aapt: expat exports its header files now.
 2015-07-22 01:12:36 +00:00
Elliott Hughes
86d5fc2874 Merge "aapt: expat exports its header files now." 2015-07-22 01:00:11 +00:00
Elliott Hughes
b48adad2ed aapt: expat exports its header files now. 
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
 2015-07-21 17:25:01 -07:00
Jeff Sharkey
2f7e00554a am 426020b8: am b109b134: am 934995ed: am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit '426020b80d2214e3e993140abbfe4adc7b14de81':
  Avoid NPE when no staged installs.
 2015-07-22 00:11:53 +00:00
Jeff Sharkey
426020b80d am b109b134: am 934995ed: am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'b109b1349a50e14ab52d013e6d5dde5db3d7ab67':
  Avoid NPE when no staged installs.
 2015-07-21 23:57:58 +00:00
Jun Mukai
da592929c7 Merge "Open notifications by a mouse click on status bar." 2015-07-21 23:02:03 +00:00
Jeff Sharkey
b109b1349a am 934995ed: am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit '934995ede49b1b4bd8178cd44b1c0f338356982e':
  Avoid NPE when no staged installs.
 2015-07-21 22:07:17 +00:00
John Reck
c052a9a1bb am a2fd3234: am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit 'a2fd32348b06b22963fcc7c33179fddbd2394dbf':
  Mark isInUse per-window
 2015-07-21 22:00:50 +00:00
Jeff Sharkey
934995ede4 am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
  Avoid NPE when no staged installs.
 2015-07-21 21:52:57 +00:00
Fyodor Kupolov
a48c0304bf am cc432cc0: am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit 'cc432cc08919cec386213f993b36bfdc5adf6ed0':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:49:41 +00:00
John Reck
a2fd32348b am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '3bfe4b47c7629fab50e64a62d1fa72ab714aa9e0':
  Mark isInUse per-window
 2015-07-21 21:45:54 +00:00
Amith Yamasani
9ade08733f am f8db3c64: am aef8716e: am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit 'f8db3c64984de6c2220578d4c9c12570c3d752b8':
  Don't kill apps that are multi-user aware...
 2015-07-21 21:43:57 +00:00
Alex Klyubin
3ad6585cbd am 215d3eb4: am e7d360c3: am a3686e4b: am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit '215d3eb4dcdd0a1bbd6eb7bf478a71690343f111':
  KM module may consume less input than provided by finish time.
 2015-07-21 21:43:45 +00:00
Adam Lesinski
26bfaa5c97 am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '208d273edcaa59470fa1a83d96b0b3cd036dbbf1':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 21:43:32 +00:00
Christopher Tate
d795d4ffcb am 75fc69ad: am 8f9a223e: am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit '75fc69addd791738ba6162ecefbba93c5329f502':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 21:43:21 +00:00
Svetoslav
373ee3811f am 2cf699c5: am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit '2cf699c5314a89e02127cc7e2535cdb7ea385162':
  Always create nodes for views backed by an adapter.
 2015-07-21 21:43:10 +00:00
Jeff Sharkey
b020b0d97d am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'cf051d1846c347413d8c907b42f3fce74795a815':
  Avoid NPE when no staged installs.
 2015-07-21 21:36:56 +00:00
John Reck
3bfe4b47c7 am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1cd5afc135b0aea3249219fcfb393d9bd9b53ec2':
  Mark isInUse per-window
 2015-07-21 21:32:43 +00:00
Fyodor Kupolov
cc432cc089 am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '5211528b9d1f51dca284d40e8d63dc3bc9527ac7':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:31:44 +00:00
Jeff Sharkey
cf051d1846 Merge "Avoid NPE when no staged installs." into mnc-dev 2015-07-21 21:23:59 +00:00
Fyodor Kupolov
5211528b9d am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '67cd2fc5eb92dd1fb2fe6621d3d1d4dd33f199ce':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:19:50 +00:00
John Reck
1cd5afc135 am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '9317d0b9904573bdb0d815ec563dd263447f11db':
  Mark isInUse per-window
 2015-07-21 21:19:47 +00:00
Fyodor Kupolov
67cd2fc5eb am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit 'cf6500b9bae461107d5c0c58de511df907d19fb3':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:05:01 +00:00
John Reck
9317d0b990 am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:04:45 +00:00
Amith Yamasani
f8db3c6498 am aef8716e: am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit 'aef8716ed92a69322cd84836e45f320f10cc22e3':
  Don't kill apps that are multi-user aware...
 2015-07-21 21:02:34 +00:00
John Reck
1fddd3efa9 Merge "Mark isInUse per-window" into mnc-dev 2015-07-21 20:50:30 +00:00
Fyodor Kupolov
cf6500b9ba am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 20:50:24 +00:00
Soonil Nagarkar
2ec5c5cced Fix reintroduction of b/10845061 
Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
 2015-07-21 20:49:59 +00:00
Alex Klyubin
215d3eb4dc am e7d360c3: am a3686e4b: am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit 'e7d360c32ee6bd1758a5ba5c844cab4caf2648ee':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:48:27 +00:00
Amith Yamasani
aef8716ed9 am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit 'b82c71a893cef1f18539ae48aafcca170809cc18':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:46:58 +00:00
Alex Klyubin
e7d360c32e am a3686e4b: am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit 'a3686e4b388f174b2a952fee9e3d8e9b39eb47e4':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:33:42 +00:00
Amith Yamasani
b82c71a893 am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '89d4131d75cc4c89e3fb36115be929837c9a3171':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:33:07 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Adam Lesinski
208d273edc am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'e1cd38e9298f0a62418e95adee64e5f2d7e36297':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 20:24:36 +00:00
Alex Klyubin
a3686e4b38 am a69e72c5: am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit 'a69e72c54786d2e3a585162b3bd71f325a1a6865':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:18:03 +00:00
Amith Yamasani
89d4131d75 am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '09ba71513ba3bb092eb3effbe45953c50430ff20':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:18:02 +00:00
Christopher Tate
75fc69addd am 8f9a223e: am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit '8f9a223e2f9601d579a47c93efcd92772ee0c405':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 20:08:52 +00:00
Adam Lesinski
e1cd38e929 am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'ca34b18481084b67fc690ee9c64301f785756dde':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 20:08:37 +00:00
Amith Yamasani
09ba71513b Merge "Don't kill apps that are multi-user aware..." into mnc-dev 2015-07-21 20:04:22 +00:00
Alex Klyubin
a69e72c547 am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit '5d586dd585a6663290b68abce433a75b5760fc5d':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:02:21 +00:00
Adam Lesinski
ca34b18481 am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'a50f43e0028ec174827e73d1e45666b8e694808f':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:54:24 +00:00
Christopher Tate
8f9a223e2f am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit '22fac49a7be4e51de31287156885aa76a568c979':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 19:53:53 +00:00
Svetoslav
2cf699c531 am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit 'aeb34f1a516b9094a7552b8bb473756ab6079694':
  Always create nodes for views backed by an adapter.
 2015-07-21 19:53:51 +00:00
Alex Klyubin
5d586dd585 Merge "KM module may consume less input than provided by finish time." into mnc-dev 2015-07-21 19:50:50 +00:00
Svetoslav
aeb34f1a51 am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit '161314fa5412068e8037f6841b5826865d038690':
  Always create nodes for views backed by an adapter.
 2015-07-21 19:44:27 +00:00
Christopher Tate
22fac49a7b am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit '6391a8d44684f64d9b803f7994f26935a563a1ee':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 19:41:19 +00:00
Adam Lesinski
a50f43e002 am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:40:24 +00:00