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

217585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Wolsheimer
2fba776ee0 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:03:53 +00:00
Erik Wolsheimer
b45defae8e Log errno when dup fd cannot be allocated BUG: 25165471 
am: 211abad3b9

* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 18:55:29 +00:00
Erik Wolsheimer
211abad3b9 Log errno when dup fd cannot be allocated 
BUG: 25165471

Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
 2015-11-16 10:29:20 -08:00
Alex Klyubin
8e028e6507 Insert Android Keystore JCA Provider at the correct position. 
Security.insertProviderAt uses 1-based positions whereas the
AndroidKeyStoreProvider.install code was incorrectly passing in
0-based positions, thus installing the AndroidKeyStoreBCWorkaround
provider one level higher than intended. This change fixes the issue
in AndroidKeyStoreProvider.

Bug: 25399691
Change-Id: I4a66bf37c0d151edb9a2349db9d91939064c0574
 2015-11-16 10:11:50 -08:00
Bryce Lee
0db53d90a0 Add Bluetooth headset API to allow disabling audio route. 
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.

Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
 2015-11-16 08:55:52 -08:00
Mark Salyzyn
45f88d02de Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 
am: c53dad8d16

* commit 'c53dad8d16c552d06ac4acb8ddbd937bda2d26d7':
  Revert "jni: is loggable speedup, not within signal"
 2015-11-16 16:42:51 +00:00
Mark Salyzyn
c53dad8d16 Merge "Revert "jni: is loggable speedup, not within signal"" 
am: 3c54ed00f3

* commit '3c54ed00f390e0ce9c555eb517594628b362705f':
  Revert "jni: is loggable speedup, not within signal"
 2015-11-16 16:35:58 +00:00
Mark Salyzyn
3c54ed00f3 Merge "Revert "jni: is loggable speedup, not within signal"" 2015-11-16 16:30:57 +00:00
Mark Salyzyn
421d434818 Revert "jni: is loggable speedup, not within signal" 
This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
 2015-11-16 16:26:44 +00:00
Geoff Mendal
c94a189e5f Import translations. DO NOT MERGE am: 83d65fea01 -s ours 
am: a6c50551cd  -s ours

* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
  Import translations. DO NOT MERGE
 2015-11-16 13:54:52 +00:00
Geoff Mendal
a6c50551cd Import translations. DO NOT MERGE 
am: 83d65fea01  -s ours

* commit '83d65fea01c4233c80161acdd69b64fa559c3749':
  Import translations. DO NOT MERGE
 2015-11-16 13:38:58 +00:00
Geoff Mendal
83d65fea01 Import translations. DO NOT MERGE 
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
 2015-11-16 14:18:40 +01:00
Calin Juravle
c3a70ce001 Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d 
am: e20120031f

* commit 'e20120031fd573c3beef4892f6917ba1553db6a8':
  Remove obsolete profile handling from AndroidRuntime.
 2015-11-16 11:35:56 +00:00
Calin Juravle
e20120031f Merge "Remove obsolete profile handling from AndroidRuntime." 
am: 360e95a90d

* commit '360e95a90dab2c2522aa3ba13c6b2a3df737e626':
  Remove obsolete profile handling from AndroidRuntime.
 2015-11-16 11:20:55 +00:00
Calin Juravle
360e95a90d Merge "Remove obsolete profile handling from AndroidRuntime." 2015-11-16 11:08:06 +00:00
Eino-Ville Talvala
0b6e1bfae8 Camera: Minor documentation update 
- Further clarify hardware.camera feature being only for the back camera

Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
 2015-11-13 15:25:45 -08:00
Michael Wright
333db2e122 DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
 2015-11-13 21:53:14 +00:00
Michael Wright
84669ca8de DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
 2015-11-13 21:52:18 +00:00
Yang Ni
89baba188e Merge "Various fixes in setting globals in a script group" am: c011ffd842 
am: 7ee861abae

* commit '7ee861abaeac214a889d8f4113db41970599793b':
  Various fixes in setting globals in a script group
 2015-11-13 21:26:15 +00:00
Yang Ni
7ee861abae Merge "Various fixes in setting globals in a script group" 
am: c011ffd842

* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
  Various fixes in setting globals in a script group
 2015-11-13 21:17:33 +00:00
Yang Ni
c011ffd842 Merge "Various fixes in setting globals in a script group" 2015-11-13 21:11:25 +00:00
Winson Chung
d2b3d8bff1 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef 
am: 20ba5c919b

* commit '20ba5c919bb97bb922919a34b3a081ea26b25000':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:51:18 +00:00
Winson Chung
20ba5c919b Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 
am: 28fc76ecef

* commit '28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:44:29 +00:00
Winson Chung
da131290ae Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec 
am: ef15ca85d7

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:37:16 +00:00
Winson Chung
28fc76ecef Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec 
am: ef15ca85d7

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:37:15 +00:00
Winson Chung
ef5feb290a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 
am: 3bab0fd4f7

* commit '3bab0fd4f7b848d45ce94b96abbdc537d1e47a5a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:35 +00:00
Winson Chung
ef15ca85d7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours 
am: d45a18c8ec

* commit 'd45a18c8eca074f8c83a64ed465021a61becb49a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:33 +00:00
Winson Chung
d45a18c8ec Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 
am: 32265b9ea0  -s ours

* commit '32265b9ea000b04ac62f3c114edb063246260401':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:55 +00:00
Winson Chung
3bab0fd4f7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 
am: 1b29fd87a2

* commit '1b29fd87a26d6230c55c701d1411b34342614af0':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:53 +00:00
Winson Chung
32265b9ea0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 
am: b133b984a0

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:30 +00:00
Winson Chung
fed6ffd87a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d 
am: 3e9f2b7894

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:29 +00:00
Winson Chung
1b29fd87a2 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d 
am: 3e9f2b7894

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:29 +00:00
Winson Chung
b133b984a0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 
am: bb4da4efc3

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:38 +00:00
Winson Chung
3e9f2b7894 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 
am: dce0f8040d

* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:35 +00:00
Winson Chung
dce0f8040d Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 2015-11-13 18:02:47 +00:00
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Yang Ni
263cc90345 Various fixes in setting globals in a script group 
Bug: 25602504

1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.

2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.

3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.

Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
 2015-11-13 10:00:12 -08:00
Filip Gruszczynski
f9661eafa0 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca 
am: 0e6007d229

* commit '0e6007d22928da4c529a5fa773fbeeb441421804':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:26:47 +00:00
Filip Gruszczynski
0e6007d229 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 
am: fe482e0bca

* commit 'fe482e0bcabb98d983ecb4080b35490b9814c809':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:20:05 +00:00
Filip Gruszczynski
fe482e0bca Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 2015-11-13 17:15:14 +00:00
Mark Salyzyn
5f6b645985 Merge "jni: is loggable speedup, not within signal" am: 96e780c99c 
am: 33a0db92aa

* commit '33a0db92aaf1f50cefaab0215b59e7e513f55d32':
  jni: is loggable speedup, not within signal
 2015-11-13 15:29:35 +00:00
Mark Salyzyn
33a0db92aa Merge "jni: is loggable speedup, not within signal" 
am: 96e780c99c

* commit '96e780c99c46e805989b7f1d6486cef96c7d2c27':
  jni: is loggable speedup, not within signal
 2015-11-13 15:22:05 +00:00
Mark Salyzyn
96e780c99c Merge "jni: is loggable speedup, not within signal" 2015-11-13 15:16:48 +00:00
Diego Perez
6777f54fa4 Fix delegation of methods within inner static classes 
Currently, delegation of inner static classes methods is broken since
the rewritten method tries to pass an instance to the outer class. This
updates the method generation to only pass the reference if the inner
class is not static.

Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
 2015-11-13 14:06:50 +00:00
Wale Ogunwale
4ff84631af Initialize DisplayContent base info when object is constructed 
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
 2015-11-12 20:46:07 -08:00
Shreyas Basarge
69c1bf1de0 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 
am: 9752605815

* commit '9752605815ee8956e855c468d341e9f18031c53e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:55:08 +00:00
Shreyas Basarge
9752605815 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 
am: d80d24f5b1

* commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:48:52 +00:00
Shreyas Basarge
d80d24f5b1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:55 +00:00
Shreyas Basarge
6bdb49f9f7 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:52 +00:00
Matthew Williams
0d9b625236 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 
am: 7336557937

* commit '73365579374d1460aca6abd05dbbc2e1417dee6f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:52 +00:00