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

118396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
b251e0794a am 33c7520b: am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '33c7520b68e015c46ed1bcb277dc4faaa368cc55':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 16:14:19 -07:00
Igor Murashkin
560ce7738c am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'ee46eab2d026c9d22d6243cc945c150c877edc16':
  Trace: add ALOGVs for easier debugging
 2013-10-25 16:14:10 -07:00
Christopher Tate
dde92b755f am 66f6fa7b: am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '66f6fa7b3617ecf919d879157d6205321685db61':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 16:14:04 -07:00
Marco Nelissen
33b6b96686 am a22010eb: (-s ours) am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'a22010ebe533aafe1b3d488128f3df757f306dd0':
  Add a method to set a list of uids for a wake lock
 2013-10-25 16:13:59 -07:00
Dianne Hackborn
33c7520b68 am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '0b1ec0165a5dc98bc82670288894af446ff5bcaa':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 15:37:30 -07:00
Dianne Hackborn
0b1ec0165a am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '19d79659ee4c0e85775422ccbed3fa14c82fa66b':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 15:32:21 -07:00
Dianne Hackborn
19d79659ee Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 2013-10-25 22:30:35 +00:00
Igor Murashkin
ee46eab2d0 am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'ba111ef9b5ed90d6b5021086548fcc9c35953ecf':
  Trace: add ALOGVs for easier debugging
 2013-10-25 15:17:31 -07:00
Igor Murashkin
ba111ef9b5 am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'c802a6614095660bccfd0cdf4f15404ad1863b76':
  Trace: add ALOGVs for easier debugging
 2013-10-25 15:15:12 -07:00
Igor Murashkin
c802a66140 Merge "Trace: add ALOGVs for easier debugging" into klp-dev 2013-10-25 22:11:07 +00:00
Christopher Tate
66f6fa7b36 am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '9a9952571a19eb849558885215b0bbe564a9176c':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 15:06:15 -07:00
Christopher Tate
9a9952571a am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '6aedab9b64b0ba23ffb760f5b6b8c45675372030':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 15:02:53 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
 2013-10-25 15:01:34 -07:00
Christopher Tate
6aedab9b64 Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 2013-10-25 21:59:41 +00:00
Marco Nelissen
d19385bf58 am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit '2165718153c1288dee7e106f0c61d952f515600b':
  Add a method to set a list of uids for a wake lock
 2013-10-25 14:58:12 -07:00
Marco Nelissen
2165718153 Merge "Add a method to set a list of uids for a wake lock" into klp-dev 2013-10-25 21:55:55 +00:00
Dianne Hackborn
de0e83bc39 Fix issue #11374840: adb shell am startservice not working any more 
The startService() and stopServie() calls had a redundant check for
the incoming user ID being valid, but with its own custom implementation
that doesn't match the normal handleIncomingUser flow.  In fact, for
both of these we are going to do handleIncomingUser anyway when we get
to retrieveServiceLocked(), so there was just no need for this.

Change-Id: I14409a03781a14a5f1a786aceb31dcc77efb062c
 2013-10-25 14:34:18 -07:00
Svetoslav Ganov
9f598351ca am 01b1e661: am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev 
* commit '01b1e66135f3e727be47300510443d149d8679cd':
  Update the documentaton of the android.print package.
 2013-10-25 14:04:56 -07:00
Jean-Michel Trivi
cfcd53a815 am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev 
* commit '33f713d2b3663ac05d145a0d971b009d9e0988a7':
  Limit RemoteControlClient generation ID changes
 2013-10-25 14:04:52 -07:00
John Spurlock
7534df88fc resolved conflicts for merge of 286291bf to master 
Change-Id: Ied118f11f0a070b610e4edc4695a07418dcf7ce9
 2013-10-25 17:01:46 -04:00
Christopher Tate
062bce7d87 DOCS: document API 19+ Alarm Manager API and behaviors 
Bug 9941334

Change-Id: I65473bd62f7113c74ed6277d61db56c76441ff1b
 2013-10-25 13:59:44 -07:00
Svetoslav Ganov
01b1e66135 am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev 
* commit '1aae2c477772378b447da35717882c76aa39fb67':
  Update the documentaton of the android.print package.
 2013-10-25 13:54:07 -07:00
Svetoslav Ganov
1aae2c4777 am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev 
* commit '2a40da558b267b91ed0b0c9090656bdc02db2833':
  Update the documentaton of the android.print package.
 2013-10-25 13:51:45 -07:00
Svetoslav Ganov
2a40da558b Merge "Update the documentaton of the android.print package." into klp-dev 2013-10-25 20:48:45 +00:00
Jean-Michel Trivi
33f713d2b3 am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev 
* commit 'a60057c054617d9842006a89a79e037fd7592a7f':
  Limit RemoteControlClient generation ID changes
 2013-10-25 13:44:26 -07:00
Jean-Michel Trivi
a60057c054 am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev 
* commit 'd4249251e0a707d4fbc617b7556cb4c8c5163132':
  Limit RemoteControlClient generation ID changes
 2013-10-25 13:43:06 -07:00
Jean-Michel Trivi
d4249251e0 Merge "Limit RemoteControlClient generation ID changes" into klp-dev 2013-10-25 20:41:39 +00:00
John Spurlock
286291bf86 am d958b78d: am 4a7f3ada: Merge "Optimize system bar background drawable." into klp-dev 
* commit 'd958b78de92a3697eba4c7b47b39cffe88757b7d':
  Optimize system bar background drawable.
 2013-10-25 13:39:57 -07:00
John Spurlock
d958b78de9 am 4a7f3ada: Merge "Optimize system bar background drawable." into klp-dev 
* commit '4a7f3adaf08e65eceaad0e69f8edcdbcb897011a':
  Optimize system bar background drawable.
 2013-10-25 13:36:31 -07:00
John Spurlock
4a7f3adaf0 Merge "Optimize system bar background drawable." into klp-dev 2013-10-25 20:33:35 +00:00
John Spurlock
04aa159ac6 am a281dda7: am baa18a39: am f3b5b37b: Merge "Reset our status bar window fade color on screen off." into klp-dev 
* commit 'a281dda794625b69917d192c21e764e583149b99':
  Reset our status bar window fade color on screen off.
 2013-10-25 13:33:34 -07:00
John Spurlock
a281dda794 am baa18a39: am f3b5b37b: Merge "Reset our status bar window fade color on screen off." into klp-dev 
* commit 'baa18a3966b0eee205e5c028b4d109e9b6a56e2f':
  Reset our status bar window fade color on screen off.
 2013-10-25 13:30:12 -07:00
Jeff Sharkey
92706ac8df am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev 
* commit 'd8a81d06e4649498b3ba884f2e5443701e13d023':
  Skip writing PFD status when comm is closed.
 2013-10-25 13:28:50 -07:00
John Spurlock
baa18a3966 am f3b5b37b: Merge "Reset our status bar window fade color on screen off." into klp-dev 
* commit 'f3b5b37b14c49cfe9a74abd25afa5e071ec55b51':
  Reset our status bar window fade color on screen off.
 2013-10-25 13:27:52 -07:00
Jeff Sharkey
d8a81d06e4 am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev 
* commit 'fd38f940f4283f9ea68142185426a7cf45d58ae0':
  Skip writing PFD status when comm is closed.
 2013-10-25 13:25:31 -07:00
John Spurlock
f3b5b37b14 Merge "Reset our status bar window fade color on screen off." into klp-dev 2013-10-25 20:25:08 +00:00
Jeff Sharkey
fd38f940f4 am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev 
* commit 'ac4bf7fd9ade1bf8448b67feb3935bf4620714d5':
  Skip writing PFD status when comm is closed.
 2013-10-25 13:22:12 -07:00
Craig Mautner
2788751652 am 1f57b605: am 6f2fb33f: am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev 
* commit '1f57b6055ea4c80980a03a229e720bb9420cc5f9':
  Do not take screenshots when launching activities...
 2013-10-25 13:18:31 -07:00
Jim Miller
8fd09e8d8f am 854b63f6: am 8b98e040: am 5357f8fd: Merge "Remove \'?\' icon in layout for "Forgot pattern" button" into klp-dev 
* commit '854b63f67464e9679d3dcb7e68d626e55ad3520b':
  Remove '?' icon in layout for "Forgot pattern" button
 2013-10-25 13:18:27 -07:00
Jeff Sharkey
ac4bf7fd9a Merge "Skip writing PFD status when comm is closed." into klp-dev 2013-10-25 20:17:03 +00:00
Craig Mautner
1f57b6055e am 6f2fb33f: am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev 
* commit '6f2fb33f907b3af246f79a72e79ea7e4192c7478':
  Do not take screenshots when launching activities...
 2013-10-25 13:15:13 -07:00
Jim Miller
854b63f674 am 8b98e040: am 5357f8fd: Merge "Remove \'?\' icon in layout for "Forgot pattern" button" into klp-dev 
* commit '8b98e04092d6ef92f84e198853535dffb0d0610a':
  Remove '?' icon in layout for "Forgot pattern" button
 2013-10-25 13:15:09 -07:00
Craig Mautner
6f2fb33f90 am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev 
* commit 'd4d170de39fffe70aaa39c70d6936465e0adb6ee':
  Do not take screenshots when launching activities...
 2013-10-25 13:12:05 -07:00
Jim Miller
8b98e04092 am 5357f8fd: Merge "Remove \'?\' icon in layout for "Forgot pattern" button" into klp-dev 
* commit '5357f8fd24bc578a1a584cac9c1943227816ea05':
  Remove '?' icon in layout for "Forgot pattern" button
 2013-10-25 13:12:02 -07:00
Craig Mautner
d4d170de39 Merge "Do not take screenshots when launching activities..." into klp-dev 2013-10-25 20:09:20 +00:00
Jim Miller
5357f8fd24 Merge "Remove '?' icon in layout for "Forgot pattern" button" into klp-dev 2013-10-25 20:08:40 +00:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock 
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
 2013-10-25 12:49:55 -07:00
Dianne Hackborn
27dab38891 am f09a1b88: am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 
* commit 'f09a1b88ae87abb750bda62f97fce1633a9cab7d':
  Fix issue #11290095: Parcel change causing crashing in KLP...
 2013-10-25 12:26:43 -07:00
Dianne Hackborn
f09a1b88ae am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 
* commit 'aec8fbb354621dc49a4ac971a64706bee01e5806':
  Fix issue #11290095: Parcel change causing crashing in KLP...
 2013-10-25 12:21:26 -07:00
Dianne Hackborn
aec8fbb354 am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 
* commit 'df033aed9d403993ca65a54cc4bfbdbe36f376bb':
  Fix issue #11290095: Parcel change causing crashing in KLP...
 2013-10-25 12:18:16 -07:00