213244 Commits

Author SHA1 Message Date
Amith Yamasani
f3c432059c Merge "Transit to correct state after alarm is fired" 2016-02-04 21:52:54 +00:00
Koji Fukui
27b33306e6 Transit to correct state after alarm is fired
Symptom:
When AlarmClock fires in IDLE, state is changed to ACTIVE.
But the ACTIVE state continues under some conditions.

Root cause:
Transition from IDLE state to ACTIVE state when AlarmClock fires
1.	Send ACTION_STEP_IDLE_STATE intent
2.	Calles onReceive() in BroadcastReceiver
3.	Calles stepIdleStateLocked()
4.	Calles becomeActiveLocked() 

Check point (1) to change from ACTIVE state to INACTIVE
(Display On -> Off)
1.	onDisplayChanged()
2.	updateDisplayLocked()
3.	becomeInactiveIfAppropriateLocked()

Check point (2) to change from ACTIVE state to INACTIVE
(charging -> not charging)
1.	ACTION_BATTERY_CHANGED
2.	updateChargingLocked()
3.	becomeInactiveIfAppropriateLocked()

There are only two check points to change from ACTIVE to INACTIVE.
If state transition, from IDLE to ACTIVE,
happened by AlarmClock when display is off and not charging,
ACTIVE state will be kept and never changes to INACTIVE state.

Change-Id: I93398366307f529b9c0074ac58b19ad6e4695790
2016-02-04 10:56:24 +09:00
Andre Eisenbach
026a58476b Merge "Implementation of BluetoothDevice.createBondOutOfBand" 2016-02-04 00:25:34 +00:00
Jakub Pawlowski
c28caad44b Implementation of BluetoothDevice.createBondOutOfBand
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.

Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
2016-02-03 16:12:47 -08:00
Eric Laurent
81e7a58754 Merge "Bluetooth: Restrict gain for Absolute volume case" 2016-02-03 17:30:39 +00:00
Liejun Tao
4565a47d91 Bluetooth: Restrict gain for Absolute volume case
For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.

Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>
2016-02-02 12:24:15 -06:00
Narayan Kamath
60cbd0b02b Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f." 2016-02-02 11:55:59 +00:00
Narayan Kamath
edf2d224a2 Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
2016-02-02 11:40:12 +00:00
Narayan Kamath
21b2b7306e Merge "Alarm: add missing closedir after opendir when searching for RTC" 2016-02-02 09:31:04 +00:00
Mykola Kondratenko
e45abfa083 Alarm: add missing closedir after opendir when searching for RTC
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().

Fix degrade introduced by Google commit 0eb58268.

Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
2016-02-02 09:30:50 +00:00
Narayan Kamath
c71c44a524 Merge "close file in PersistentDataBlockService jni" 2016-02-01 11:31:22 +00:00
Lianwei Wang
5c74bb313f close file in PersistentDataBlockService jni
The opened file should be closed.

Change-Id: I8a43b338c5c9eb0a5b1b5329eec767c6395bc7eb
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>
2016-02-01 11:31:12 +00:00
Kenny Root
c76789d35a Merge changes from topic 'sni'
* changes:
  Track libcore change
  Track libcore change
2016-02-01 10:58:14 +00:00
Kenny Root
779efda769 Track libcore change
This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.

Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273
2016-02-01 02:55:34 -08:00
Kenny Root
542349a995 Track libcore change
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.

Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
2016-02-01 02:55:17 -08:00
Stephen Hines
49aee686d8 Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API." 2016-01-30 17:44:52 +00:00
Neil Fuller
31312ecfd2 Merge "Unhide @Repeatable" 2016-01-29 16:19:36 +00:00
Neil Fuller
6fa925a76c Unhide @Repeatable
Bug: 26623636
(cherry-picked from commit c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)

Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
2016-01-29 16:17:31 +00:00
Neil Fuller
45a1ea33a4 Merge "Unhide @FunctionalInterface" 2016-01-29 16:10:13 +00:00
Neil Fuller
679e4037f2 Unhide @FunctionalInterface
Bug: 26623636
(cherry-picked from commit c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
2016-01-29 16:07:43 +00:00
Neil Fuller
b05fa3e841 Merge "Unhide Method.isDefault" 2016-01-29 15:31:38 +00:00
Neil Fuller
d2d0765e8d Unhide Method.isDefault
Bug: 26623636
(cherry-picked from commit 20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
2016-01-29 15:30:06 +00:00
Pavlin Radoslavov
26fdbc1833 Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user" 2016-01-28 00:52:41 +00:00
Pavlin Radoslavov
2956beeec9 Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.

Bug: 26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
2016-01-27 16:22:15 -08:00
Miao Wang
6ebdbfa549 Merge "[RenderScript] Implement APIs for better multi-frame process support." 2016-01-27 21:30:00 +00:00
Marie Janssen
d63847a866 Merge "IBluetooth: remove dump(), support arguments" 2016-01-27 20:42:07 +00:00
Przemyslaw Szczepaniak
804e1e8c15 Merge "Remove java.nio.file package" 2016-01-27 15:03:39 +00:00
Przemyslaw Szczepaniak
b1819b4eb2 Remove java.nio.file package
This package has no test coverage, and we don't
know if it was ported properly. This package will
be added in future, with a test suite.

Bug: 26786186
Change-Id: I1bd7989837040da06cd914d366e9674d6b36fe86
2016-01-27 11:14:53 +00:00
Miao Wang
8c1509249c [RenderScript] Implement APIs for better multi-frame process support.
Bug: 23535524

 Two APIs added for multiframe processing:
 - createAllocations(...): To create an array of Allocations sharing the
   same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
   the same BufferQueue.
 - getTimeStamp(): API to retrieve the time stamp associated with the
   most recent buffer.

Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
2016-01-26 14:40:44 -08:00
Przemyslaw Szczepaniak
1f3aaf82cb Merge "Fix incorrect @hide usage in libcore" 2016-01-26 10:37:47 +00:00
Przemyslaw Szczepaniak
02027ff589 Fix incorrect @hide usage in libcore
@hide annotation is only effective in Javadoc.

Bug: 26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
2016-01-26 10:35:22 +00:00
Miao Wang
ed50f333fb Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" 2016-01-26 01:11:41 +00:00
Miao Wang
0facf021ea [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
Bug: 25926361
Bug: 23535524

  - Construct the ByteBuffer using the AllocationGetPointer.
  - Add an API to query the stride of the allocation.
  - Both ByteBuffer and Stride will be cached for normal Allocations.
    if using USAGE_IO, since after each ioReceive, the mallocPtr will
    change, getByteBuffer will always create a new one using the most
    up-to-date mallocPtr.

Change-Id: I5e84b6690e83bb062c383043275524d0e51e46eb
2016-01-25 16:12:37 -08:00
Dimitry Ivanov
5194d217b8 Merge "Remove path to the apk from the permittedPath" 2016-01-25 18:04:18 +00:00
Chad Brubaker
7519dce8c2 Merge "Add getApplicationConfigForPackage" 2016-01-25 18:03:13 +00:00
Martijn Coenen
e168012ff2 Merge "Implementation of HCE for NFC-F." 2016-01-25 09:48:43 +00:00
Chad Brubaker
056e8b5a5a Add getApplicationConfigForPackage
This allows services which make network connections on behalf of
applications to honor the application's network security policy.

Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
2016-01-22 22:04:20 -08:00
Jorim Jaggi
b7fbe1104f Merge "NullPointerException when starting VoiceInteractionManagerService" 2016-01-23 02:09:36 +00:00
Deepanshu Gupta
187c022bf1 Merge "Remove GregorianCalendar hack" 2016-01-22 23:53:07 +00:00
Dimitry Ivanov
ee5a181371 Remove path to the apk from the permittedPath
Bug: http://b/26732624
Bug: http://b/22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
2016-01-22 13:20:29 -08:00
Deepanshu Gupta
4f3d0c6caa Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
2016-01-22 11:33:53 -08:00
David Gross
fca558c549 Merge "Add general reduction plumbing starting with Java Script::reduce()." 2016-01-22 17:00:43 +00:00
Yoshinobu Ito
c52adfe124 Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.

Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
               Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>

Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
2016-01-22 18:14:18 +09:00
Marie Janssen
0c04ccd952 IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().

Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
2016-01-21 23:53:37 +00:00
Robert Greenwalt
4d9ffdf952 Merge "Add free short codes for Direct Carrier Billing and others." 2016-01-21 22:10:55 +00:00
John Reck
550d46d9da Merge "libhwui: fix texture memory leak" 2016-01-21 21:48:24 +00:00
Sergio Giro
eb93182dfb Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 2016-01-21 17:08:21 +00:00
Sergio Giro
ab72367506 org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.

Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
2016-01-21 17:04:58 +00:00
Dohyun Lee
c5a3efd286 libhwui: fix texture memory leak
When there is not enough space and we cannot delete any
Texture in TextureCache to secure space, a new Texture is
created over and over again for the same SkBitmap and
there is the case that it is not deleted.
This patch avoids such cases.

Change-Id: Ic5353995e6d0716c31fe3bb49c60ec1a71574643
Signed-off-by: Dohyun Lee <leedhyun11@gmail.com>
2016-01-21 13:46:21 +09:00
Vasco Brito
f31caeaa8b Add free short codes for Direct Carrier Billing and others.
Whitelist free short code batch 2016 Q1 - Android Partner
Engineering.
All short codes are used by Direct Carrier Billing on
Google Play except for the short code 83669 in "gb" which
is used by a banking application.

Change-Id: Idbc02e697c8923288beb0b88545e6cee448ad4f5
Signed-off-by: Vasco Brito <vascob@google.com>
2016-01-20 23:39:23 +00:00