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

125220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
edb35cf57c am 110af567: (-s ours) am 8e701650: am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '110af567e6b213c3adb053e71ce21b08d8880e4d':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-08 04:16:03 +00:00
Wei Wang
c9d49ff0f1 am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit 'e3318addc9c42a7b6d9d1ba8eaff786236b6dec0':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:18:50 +00:00
Wei Wang
e3318addc9 am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '1062080cd323c14d5bd24fb308da9431a0d250e5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:15:08 +00:00
Wei Wang
1062080cd3 am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '0ea81eed882d288c9473e377639b0b88280fd044':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:11:17 +00:00
Adam Powell
e61accbeb0 am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit '6256352364c53ce841e7635f637713a0b7677be6':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 02:09:36 +00:00
Marco Nelissen
7c1a11c4be am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '1b49f10580a33838de54389095dbe5dddd0bc22b':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 02:09:33 +00:00
Craig Mautner
889f705df3 am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit 'f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 02:09:30 +00:00
Wei Wang
0ea81eed88 am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '1327e59f36ceea5a1ee7dc66b311206345353de5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:05:57 +00:00
Adam Powell
6256352364 am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'c4a6df22649378631c4e541ed81c5848735427dd':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 02:03:06 +00:00
Marco Nelissen
1b49f10580 am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit 'bf0fdac12d325098b65cde2c76dece85b753d663':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 02:03:03 +00:00
Craig Mautner
f8c4c3c765 am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '508e88e329cd157c3de94ccbac7374038f7e2355':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 02:03:00 +00:00
Wei Wang
1327e59f36 Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 2014-03-08 02:01:02 +00:00
Dave Allison
199670c46a am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit '324aa693b82656809b97e307676adbbce37c3d95':
  ART profiler usage.
 2014-03-08 02:00:39 +00:00
Tim Kilbourn
a81ee86b58 am 032305fb: am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 
* commit '032305fbcf1f1923030723d60621d8bbfa138511':
  Dump leanback info in aapt dump badging.
 2014-03-08 02:00:36 +00:00
Ying Wang
71364f8c1e am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit 'f5f4d9306011ea1b10d25c959334f3e62df4447e':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 02:00:34 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
 2014-03-08 01:56:29 +00:00
Jeff Brown
9e3de5f70d am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '6f9f8e7aad2f74bc2089a081139111012e62f7db':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-08 01:55:44 +00:00
Adam Powell
c4a6df2264 am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit '96192157b88d3630827a9ffd55693866734b4da3':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 01:55:41 +00:00
Marco Nelissen
bf0fdac12d am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit 'f41efb446a40f0904f3788c2a773f2a700b1342a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 01:55:36 +00:00
Craig Mautner
508e88e329 am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 01:55:33 +00:00
Tim Kilbourn
032305fbcf am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 
* commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e':
  Dump leanback info in aapt dump badging.
 2014-03-08 01:55:00 +00:00
Ying Wang
f5f4d93060 am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit '74bebf6faed2d34814ffc3d46664330ea568f7b2':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 01:54:52 +00:00
Vineeta Srivastava
c07db94e2e am d6a263f4: am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'd6a263f46b9050ca0cb8f7743ce38f3ac9c7466d':
  telephony: Add same named operator configuration for some operators
 2014-03-08 01:53:54 +00:00
Amith Yamasani
734983fff3 Allow related users to show activities on primary user 
Make ActivityManager and WindowManager understand related users.

Task stack will now contain interleaved tasks for related users,
but still group regular users separately from groups of related users.

InputMethodManagerService permits related users to invoke IME and receive
key events.

Change-Id: I3bd87b32aec69c3f8d470c8b29b144f4e849c808
 2014-03-07 17:41:24 -08:00
Chris Craik
400b623209 Merge "Update Z documentation to avoid hidden API" 2014-03-08 01:12:44 +00:00
Chris Craik
29cc47a5f1 Update Z documentation to avoid hidden API 
Change-Id: I723930b951327a06dfbf2aeb8417409e6ce02c2e
 2014-03-07 17:11:26 -08:00
Fabrice Di Meglio
ebb9f3a1a3 Cleanup ContextThemeWrapper 
- remove reference to base Context as we can get it thru
getBaseContext() call

Change-Id: I2687c15db12624243fadba44d624e2e4bdae240d
 2014-03-07 17:04:52 -08:00
Alan Viverette
4fc5199760 Merge "Update fast scroller item count after layoutChildren()" 2014-03-08 01:00:31 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Robert Greenwalt
fcbced38a6 DO NOT MERGE Debounce wifi country code Info 
We're getting signals from the radio and it sometimes drops out for
a while.  This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately.  It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
 2014-03-07 16:54:58 -08:00
Alan Viverette
732ca4642f Update fast scroller item count after layoutChildren() 
BUG: 12553181
Change-Id: I4ea1b45d08c153b0146868bf57884d6b8dde6245
 2014-03-07 16:49:32 -08:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging. 
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
 2014-03-07 16:47:42 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server 
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
 2014-03-08 00:17:43 +00:00
Xia Wang
6bed599aa7 Merge "Fix state transition verification." 2014-03-08 00:15:53 +00:00
Dianne Hackborn
13305da38b Merge "Start recording wakeup reasons in battery history." 2014-03-08 00:10:15 +00:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build. 
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
 2014-03-07 15:56:14 -08:00
Marco Nelissen
110af567e6 am 8e701650: am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '8e701650179c8373a4fc5bf306befc3af2560e9d':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 23:39:24 +00:00
Vineeta Srivastava
d6a263f46b am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '230e20d26815ecc1aea1a4709cd7e188d049360f':
  telephony: Add same named operator configuration for some operators
 2014-03-07 23:39:20 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-07 23:39:12 +00:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-07 23:38:30 +00:00
Marco Nelissen
f41efb446a am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '57a45f22ea7b0509fb918fa39e797a6061f75438':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-07 23:38:27 +00:00
Dave Allison
b94904ab6d am 3fc3b9fd: Merge "ART profiler usage." 
* commit '3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068':
  ART profiler usage.
 2014-03-07 15:38:26 -08:00
Craig Mautner
9bf7f893e0 am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-07 23:38:20 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Dianne Hackborn
c51cf03cf2 Start recording wakeup reasons in battery history. 
Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel.  These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
 2014-03-07 15:18:45 -08:00
Chris Craik
9edb96b533 Merge "Update tessellation tracing" 2014-03-07 23:12:32 +00:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Chris Craik
87f9df880e Update tessellation tracing 
Change-Id: I6c73f2467817412d9936dde217df9938a6884003
 2014-03-07 14:34:55 -08:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Dave Allison
3fc3b9fd1b Merge "ART profiler usage." 2014-03-07 22:25:43 +00:00