Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,785 Commits 3 Branches 0 Tags
fdfbfc6707691ac76146cae88674bc794bc03b71
Commit Graph

197785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
fdfbfc6707 am b633615e: Merge "Fix reporting of wakelocks to battery stats." into mnc-dev 
* commit 'b633615ea6940f2806f8378c909a3d29a5265f9a':
  Fix reporting of wakelocks to battery stats.
 2015-06-22 19:37:20 +00:00
Jeff Brown
6903187a2f am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit 'd63c721e718eb19887d6528500d22b82581a6bcd':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 19:37:16 +00:00
Jeff Brown
b633615ea6 Merge "Fix reporting of wakelocks to battery stats." into mnc-dev 2015-06-22 19:29:35 +00:00
Jeff Brown
d63c721e71 Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 2015-06-22 19:29:32 +00:00
Sailesh Nepal
849dfc35bc am 20fab81a: Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev 
* commit '20fab81a09e1ca04e811c6c6d94acb08037739e7':
  Fix crash when doing conferencing over Wi-Fi
 2015-06-22 18:47:24 +00:00
Dianne Hackborn
dee3ddfa5a am 5d1462f7: Merge "Fix issue #21930140: Add config to turn off auto power features" into mnc-dev 
* commit '5d1462f708e88b54e5afe4a3c20902b05c37db97':
  Fix issue #21930140: Add config to turn off auto power features
 2015-06-22 18:40:37 +00:00
Sailesh Nepal
20fab81a09 Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev 2015-06-22 18:40:06 +00:00
Shishir Agrawal
946e37f458 am c242d9d2: Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev 
* commit 'c242d9d2aeececeda4c980dfa119b3414d818424':
  Adding hidden TM calls to scan/select cell networks.
 2015-06-22 18:31:23 +00:00
Dianne Hackborn
5d1462f708 Merge "Fix issue #21930140: Add config to turn off auto power features" into mnc-dev 2015-06-22 18:29:51 +00:00
David Christie
dffa216c46 am de4aecd8: Merge "Wait for the capabilities callback before deciding FLP HAL version." into mnc-dev 
* commit 'de4aecd8310f61d7fe9f06a5a1f684247f88d437':
  Wait for the capabilities callback before deciding FLP HAL version.
 2015-06-22 18:20:38 +00:00
Yusuke Sato
885b251d2c am a77ef4b8: Merge "Trace Process.killProcessGroup calls in server/am/" into mnc-dev 
* commit 'a77ef4b8b4c11a9fdfdca030462b7b055bf533bc':
  Trace Process.killProcessGroup calls in server/am/
 2015-06-22 18:20:33 +00:00
Shishir Agrawal
c242d9d2ae Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev 2015-06-22 18:19:58 +00:00
David Christie
de4aecd831 Merge "Wait for the capabilities callback before deciding FLP HAL version." into mnc-dev 2015-06-22 18:18:03 +00:00
Yohei Yukawa
2e24241ead am 648abe15: Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 
* commit '648abe156596a5f76e6bd883c4d25d0380bbd469':
  Set DISABLED_UNTIL_USED for the correct user in IMMS.
 2015-06-22 18:08:24 +00:00
Selim Gurun
ac7b7015e0 am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit '7c781124763cf50ede30e6836234046bf3ec0a92':
  Clarify handling client certificates
 2015-06-22 18:08:21 +00:00
Yusuke Sato
a77ef4b8b4 Merge "Trace Process.killProcessGroup calls in server/am/" into mnc-dev 2015-06-22 18:08:17 +00:00
Yohei Yukawa
648abe1565 Merge "Set DISABLED_UNTIL_USED for the correct user in IMMS." into mnc-dev 2015-06-22 17:59:42 +00:00
Geoff Mendal
e32d8fdb6a am c424d1f0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c424d1f0fa0018b5161ead62f87d6fda24982cc9':
  Import translations. DO NOT MERGE
 2015-06-22 17:57:17 +00:00
Selim Gurun
7c78112476 Merge "Clarify handling client certificates" into mnc-dev 2015-06-22 17:55:29 +00:00
Geoff Mendal
c424d1f0fa Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 17:42:14 +00:00
Geoff Mendal
0365d4acbc Import translations. DO NOT MERGE 
Change-Id: If66d91682adc7a02ebbf87e63b542d91c3d44037
Auto-generated-cl: translation import
 2015-06-22 10:30:49 -07:00
Pavlin Radoslavov
b6183f6fa5 am b5a479c1: Fetch the Bluetooth name and address without enabling the whole stack 
* commit 'b5a479c1f08c8ea41a1523695bc482c79ed4ea54':
  Fetch the Bluetooth name and address without enabling the whole stack
 2015-06-22 17:21:32 +00:00
Pavlin Radoslavov
b5a479c1f0 Fetch the Bluetooth name and address without enabling the whole stack 
After factory reset and first bootup, fetching the Bluetooth device
name and address is now done without explicitly enabling/disabling
the whole Bluetooth stack.
Apparently, enabling/disabling the whole stack during th first bootup
was somehow holding the kernel wakelock without releasing it.

Also, disable debug log messages for class BluetoothManagerService.

Bug: 21949364
Change-Id: Iffc14f7969d05c1456159d1f4246c53fb5df0f7a
 2015-06-22 17:10:47 +00:00
Dianne Hackborn
92617036fc Fix issue #21930140: Add config to turn off auto power features 
Doze and app standby are now off in the default platform config.
The Google overlay turns them on.  Other people can do that as
well, if they are feeling like it.

Change-Id: Ic8a87f696df94f2d8354fe0772d03b672f464e32
 2015-06-22 10:09:45 -07:00
Selim Gurun
a679ac59a1 Clarify handling client certificates 
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ida78bd89aa8867c99b4b9e4433e342767e9bac0d
 2015-06-22 10:04:01 -07:00
Kenny Guy
32327b7256 am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '434235496c6356dd5e2fc9977c5f1d0609fd3d2a':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 16:55:08 +00:00
Julia Reynolds
6286a6a85b am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit 'd66559f26da245d433b642d584ef290dc1fabfcc':
  Hide device initializer methods/fields.
 2015-06-22 16:55:04 +00:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Rubin Xu
a136f8d792 am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev 
* commit 'c54bcade1b7ec7e044aca7fe9c60357ad957a8c2':
  New internal permission to protect apps against rogue Nfc message.
 2015-06-22 15:57:52 +00:00
Derek Sollenberger
f1c031d512 am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit 'b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 15:45:11 +00:00
Rubin Xu
c54bcade1b Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev 2015-06-22 15:44:51 +00:00
Derek Sollenberger
b2aea9dcbd Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 2015-06-22 15:38:11 +00:00
Jason Monk
0dc61bc734 am 616f035b: Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev 
* commit '616f035bc9a2d9855feb2348d2b732a18ebdbffb':
  Add icon mapping for NETWORK_TYPE_IWLAN
 2015-06-22 14:38:10 +00:00
Jason Monk
616f035bc9 Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev 2015-06-22 14:29:45 +00:00
Jason Monk
c1bc9d4872 Add icon mapping for NETWORK_TYPE_IWLAN 
According to TelephonyManager#getNetworkClass, it seems to be a form
of 4g, so give it those icons.

Bug: 21338555
Change-Id: I00629572950191f30fd274367e95c3117990f671
 2015-06-22 10:22:55 -04:00
Geoff Mendal
4d44f17c7b am 3862452f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '3862452f30fa98f2652954a87cf0173889cbd0e4':
  Import translations. DO NOT MERGE
 2015-06-22 14:13:09 +00:00
Geoff Mendal
56c32d504e am 224083b8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '224083b8a12f00427194216c1d29f3744ee9d30d':
  Import translations. DO NOT MERGE
 2015-06-22 14:01:43 +00:00
Geoff Mendal
3862452f30 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 14:01:10 +00:00
Geoff Mendal
372a9a2a93 Import translations. DO NOT MERGE 
Change-Id: I2ad73428a2295cfc3824de5837ab2f927fd5d626
Auto-generated-cl: translation import
 2015-06-22 08:59:17 -05:00
Geoff Mendal
224083b8a1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 13:51:44 +00:00
Geoff Mendal
70b4edff24 Import translations. DO NOT MERGE 
Change-Id: Ifd91f44e7bb3ea8577d2054394d4e6b64c488f2b
Auto-generated-cl: translation import
 2015-06-22 08:51:18 -05:00
Derek Sollenberger
e109940d81 Enable Picture w/ HW Accelerated Canvas. 
Bug: 20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
 2015-06-22 13:18:29 +00:00
Andrei Stingaceanu
76d2204d2b am b1891b3f: Fix selection by double tap in Extracted mode 
* commit 'b1891b3fc9d07ef766978f0a39c382b217a529e0':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:05:55 +00:00
Andrei Stingaceanu
b1891b3fc9 Fix selection by double tap in Extracted mode 
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.

Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
 2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
01acdd9fea am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '8228e4247c320632ba1e401259eceae7aa2738d1':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:33:39 +00:00
Vladimir Marko
23de7c7cc9 am c2869507: Merge "Don\'t prevent notification updates in DOS protection." into mnc-dev 
* commit 'c28695079e3511e02845bad9d730753daefba8a3':
  Don't prevent notification updates in DOS protection.
 2015-06-22 09:33:34 +00:00
Vladislav Kaznacheev
8228e4247c Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 2015-06-22 09:30:20 +00:00
Vladimir Marko
c28695079e Merge "Don't prevent notification updates in DOS protection." into mnc-dev 2015-06-22 08:53:52 +00:00
Jae Seo
84ace50d19 am 37099a08: Merge "TIF: Minor code improvement" into mnc-dev 
* commit '37099a082f7e0b106e22cc59fa92ba6a3656ebb2':
  TIF: Minor code improvement
 2015-06-22 01:27:28 +00:00