214422 Commits

Author SHA1 Message Date
Elliott Hughes
3edfa8f67b The NDK samples moved a while back.
Change-Id: I10f419b0ad58f9c5417a3f06775e298c74f284dc
2016-02-09 16:12:02 -08:00
Sami Tolvanen
ee2b492832 Support persist.sys.audit_safemode
Don't leave safe more if persist.sys.audit_safemode is set, unless the
current build date is newer than the specified value.

This allows us to keep the device in safe mode across reboots until an
OTA has been applied or user data is wiped.

Bug: 26902605
Change-Id: I781c3059ea8d4fb2f0c923e4488b1932d69678d3
2016-02-09 12:43:19 -08:00
Przemyslaw Szczepaniak
9f93524112 Merge "Remove public InetAddress#getAddressInternal()" 2016-02-09 17:07:10 +00:00
Przemyslaw Szczepaniak
acfaee6e51 Merge "SocketImpl#getFileDescriptor shouldn't be public" 2016-02-09 17:05:48 +00:00
Paul Duffin
8405e5cd3b Merge "Replace usages of ShortNumberUtil with ShortNumberInfo" 2016-02-09 16:51:09 +00:00
Paul Duffin
c2884fe259 Replace usages of ShortNumberUtil with ShortNumberInfo
The ShortNumberInfo class appears to support the exact same
methods as the ShortNumberUtil class (at least in terms of the
methods used by this project) but is a singleton and so
instances cannot be created directly but instead must be
retrieved using the static getInstance() method.

The ShortNumberUtil class was deprecated in version 5.8 and
removed in 7.2.3 of libphonenumber. This change is required in
order to allow libphonenumber to be upgraded to 7.2.4.

Bug: 26975810
Change-Id: Ide40c65d12cb44453f84600fc4b5ad1ee1088470
2016-02-09 16:40:53 +00:00
Przemyslaw Szczepaniak
6c62502135 Remove public InetAddress#getAddressInternal()
This method shouldn't be public + can be replaced by
the #getAddress method

Bug: 26689841
Change-Id: I1a15e4b2085049564b1de57dbfb200d157d5ebe5
2016-02-09 10:36:31 +00:00
Przemyslaw Szczepaniak
2a705dc54d SocketImpl#getFileDescriptor shouldn't be public
It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.

Bug: 26689841
Change-Id: If275e249d2b46ee6cf22a06d62374bbf47c55342
2016-02-08 15:57:22 +00:00
Colin Cross
84b1e3554b Add dumpsys meminfo --unreachable
dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.

Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
2016-02-08 00:06:34 -08:00
John Reck
857b65657d Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case" 2016-02-05 23:38:10 +00:00
Alex Klyubin
e8fbc20e12 Merge "Fix typo in KeyInfo Javadoc." 2016-02-05 22:26:56 +00:00
Alex Klyubin
d9dded5a46 Fix typo in KeyInfo Javadoc.
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
2016-02-05 14:18:19 -08:00
Igor Murashkin
700ed048f9 Merge "api: Un-hide new reflection 1.8 APIs" 2016-02-05 17:53:04 +00:00
Igor Murashkin
a13e690566 api: Un-hide new reflection 1.8 APIs
(cherry-picked from commit 2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71
2016-02-05 17:50:50 +00:00
Martijn Coenen
1f4f7190a8 Merge "Improve NFC-F transceive() docs." 2016-02-05 09:38:16 +00:00
Martijn Coenen
6711e02033 Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.

Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
2016-02-05 10:26:16 +01:00
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
Soi, Yoshinari
22173bc180 When the device boots up, netd works more than required
When the device boots up, netd adds rules for applications
which do not have the NETWORK permission to iptables.
Therefore, optimize NetworkPolicyManagerService to not touch
uids that do not have the NETWORK permission.
This modification is similar to Google commit 88e98dfa5.

Change-Id: Ic8bb837143b9e349859210654248195d62b73d17
2016-02-03 14:58:51 +01: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
Zhang Dongsheng
892760008f libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
If eglSwapBuffers is called but the under surface was destroyed,
the EGL_BAD_NATIVE_WINDOW error may also be generated according
to the EGL spec 1.4.

This really shouldn't happen from the upper, but add the graceful
handling of this case also.

Change-Id: Ic0a599808b72f401d2a01c3dc40f9e6ea0e0a564
Signed-off-by: Zhang Dongsheng <dongsheng.zhang@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2016-02-02 10:39:49 +08: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
Shasidhar Ganiga
f99a2b6e75 Fix for framework reboot on connecting to TV through HDMI.
In LocalDisplayAdapter there is a code flow possibility for
activeColorTransform to be null, when colorTransforms are
not supported by HAL. The Fix covers this code flow path to
ensure no NullPointerException.

Change-Id: I50e1058db9ee35004551bc633ad72b9a2320b428
Issue-Id: http://code.google.com/p/android/issues/detail?id=198685
Signed-off-by: Shasidhar Ganiga <sganig@codeaurora.org>
(cherry picked from commit 8f169e26e3a5c601ed4164639d55aa9e80c365dd)
2016-02-01 15:38:42 +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