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

201136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Koulomzin
ffa2d69193 Merge "Adds config flag for USB notification." into cw-e-dev 2015-09-10 21:46:01 +00:00
Martijn Coenen
5c732ee53e am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit 'e1d2d42289afe6e6a65d2ef420b8bf8ed2b33d3b':
  Fix missing copyright headers.
 2015-09-10 21:24:22 +00:00
Martijn Coenen
e1d2d42289 Merge "Fix missing copyright headers." into mnc-dr-dev 2015-09-10 21:17:56 +00:00
Gus Prevas
3d1115dba5 Merge "Fixes cloned notification actions missing icon." into cw-e-dev 2015-09-10 19:40:19 +00:00
Gus Prevas
e753361508 Adds config flag for USB notification. 
This change modifies UsbDeviceManager such that the ongoing
system notification for USB charging state is controlled by a
config flag.

Bug: 23409719
Change-Id: I2ef24fe74923170a6e8dd02375b973b4025281e4
 2015-09-10 13:37:59 -04:00
Gus Prevas
f5bff46f6a Fixes cloned notification actions missing icon. 
This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13
 2015-09-10 13:13:45 -04:00
Amit Mahajan
5a45dc960b am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 
* commit '0018323c07d119fde7260d66f60dd9987c7b74ea':
  Add carrier config variable to hide preferred network type
 2015-09-10 01:04:43 +00:00
Daniel Sandler
847bdf0093 am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit '5b40e2253e82d46838c88e6c52dee276a781d593':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:04:39 +00:00
Amit Mahajan
0018323c07 Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 2015-09-10 00:55:15 +00:00
Daniel Sandler
5b40e2253e Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 2015-09-10 00:53:14 +00:00
Jorim Jaggi
5a9bb9516d resolved conflicts for 5d0e02b6 to cw-e-dev 
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
 2015-09-09 17:49:57 -07:00
Sungmin Choi
c03a1da5a5 Add carrier config variable to hide preferred network type 
Bug: 23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45
 2015-09-09 17:42:32 -07:00
Jeff Sharkey
5b9f8dd73f am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev 
* commit '2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89':
  Special interval value to always run benchmarks.
 2015-09-10 00:26:33 +00:00
Jorim Jaggi
5d0e02b64e Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jeff Sharkey
2ebbf4c899 Merge "Special interval value to always run benchmarks." into mnc-dr-dev 2015-09-10 00:18:43 +00:00
Jorim Jaggi
131d541ae1 am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit '16093fe3f0d824731a53a264a132504deb08421a':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0 Revert "Disable fingerprint after force lock" 
Bug: 23827042
This reverts commit 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
 2015-09-10 00:00:29 +00:00
Adrian Roos
5941c98c64 Add double-tap power button to open camera 1/2 
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
 2015-09-09 16:57:14 -07:00
Jeff Sharkey
e83d8a993d Special interval value to always run benchmarks. 
When interval is set of 0, always run benchmarks after every fstrim
pass, which is roughly daily.  We don't actually track the last
benchmark time for internal storage, so this is the best way we have
to enable this.

Also disable benchmarking completely when interval is set to -1.

Bug: 23942769
Change-Id: I11edfda063aac6e927c6cce56567169ebe83cb71
 2015-09-09 15:53:29 -07:00
Selim Cinek
12fdaf8589 am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit 'a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:15:55 +00:00
Selim Cinek
a4fca2c725 Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 2015-09-09 22:07:02 +00:00
Jorim Jaggi
b53045476c am 5e354223: Use AlarmManager for lockout reset 
* commit '5e354223d817477efac9a6a2e3ce3d9161e046a4':
  Use AlarmManager for lockout reset
 2015-09-09 20:54:42 +00:00
Jorim Jaggi
5e354223d8 Use AlarmManager for lockout reset 
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.

Bug: 23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
 2015-09-09 20:41:11 +00:00
Vineeta Srivastava
95198ee9ce am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev 
* commit 'ebd1465885af2a1de5a885dac791ee6184f85d7f':
  Add carrier config variable to hide ims apn
 2015-09-09 17:22:28 +00:00
Vineeta Srivastava
ebd1465885 Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev 2015-09-09 17:12:39 +00:00
Tyler Gunn
6544d5a2a7 am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev 
* commit 'dee1c5c948a5e1b98577a3301882aac04154b5be':
  Add carrier config for specifying invalid characters.
 2015-09-09 16:15:52 +00:00
Tyler Gunn
dee1c5c948 Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev 2015-09-09 16:09:33 +00:00
Svetoslav Ganov
db4efcfa8d am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev 
* commit 'f57d98564b26953b722ab0e14222f50e6515f36d':
  Add get_accounts app op
 2015-09-09 01:51:37 +00:00
Svetoslav Ganov
f57d98564b am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev 
* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
  Add get_accounts app op
 2015-09-09 01:42:56 +00:00
Svetoslav Ganov
4f7d0bc7af Merge "Add get_accounts app op" into mnc-dev 2015-09-09 01:36:58 +00:00
Selim Cinek
1b6f819a64 Fixed a racecondition where the camera would not launch 
If the gesture was detected while turning on, the gesture
would not launch.

Bug: 23636271
Change-Id: I166759a55137163be0c3f38fe8d1dc0c18977e11
 2015-09-08 18:10:53 -07:00
Svetoslav
ce852ddcec Add get_accounts app op 
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
 2015-09-08 17:54:37 -07:00
Zhentao Sun
6d8bdb50b0 am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit '5536d4477572e437c95111630d5c2723350d99a5':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:38:48 +00:00
Zhentao Sun
5536d44775 Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 2015-09-09 00:29:03 +00:00
Lorenzo Colitti
0bc356687e am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev 
* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:26:53 +00:00
Sungmin Choi
e9d3c11ccd Add carrier config variable to hide ims apn 
Bug: 23770219
Change-Id: I691d2594384196852d7128a9b4969ba9a861205c
 2015-09-08 17:24:39 -07:00
Lorenzo Colitti
017223acda Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev 
* changes:
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:18:39 +00:00
Jorim Jaggi
975ceef616 am 52429b4a: Cancel animation when hiding Keyguard 
* commit '52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
  Cancel animation when hiding Keyguard
 2015-09-09 00:12:31 +00:00
Jorim Jaggi
52429b4a8b Cancel animation when hiding Keyguard 
So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
 2015-09-09 00:04:23 +00:00
Selim Cinek
ad69e53e7e am edf47486: Removed the secure camera launcher 
* commit 'edf47486507f5edad1d1d8e6091b9a82f9e56930':
  Removed the secure camera launcher
 2015-09-08 23:58:58 +00:00
Selim Cinek
edf4748650 Removed the secure camera launcher 
With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.

Bug: 23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b
 2015-09-08 23:49:59 +00:00
Zhentao Sun
e9cb08209f Changed the vibration duration from 1s to 750ms. 
Fixed b/23727634.

Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c
 2015-09-08 15:41:25 -07:00
Android Git Automerger
c698ece7cf am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '3bed3bf498eadcaa760608a415c66e017d2eb690':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:04:36 +00:00
Cheryl Potter
fb53f11515 am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit 'd35c7940112fa7edae03a1b43670157787a69d3d':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:04:32 +00:00
Android Git Automerger
3bed3bf498 am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '92aeac3499e91985a266590aff88b06a9633b667':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:55:50 +00:00
Cheryl Potter
d35c794011 am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit '2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:55:46 +00:00
Android Git Automerger
92aeac3499 am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:46:08 +00:00
Cheryl Potter
2c31a0d774 am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit '9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:46:02 +00:00
Android Git Automerger
1c88f60562 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-09-08 21:37:33 +00:00
Cheryl Potter
9e28efe4e7 docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 21:36:54 +00:00