1208 Commits

Author SHA1 Message Date
Neil Fuller
144af426cd Merge "Adjust for changes to libcore/Docs.mk" am: f5e3398596
am: c08debc23a

* commit 'c08debc23ab0dfa38cab168f4c631b15b2b17d64':
  Adjust for changes to libcore/Docs.mk
2015-10-26 10:17:55 +00:00
Neil Fuller
c08debc23a Merge "Adjust for changes to libcore/Docs.mk"
am: f5e3398596

* commit 'f5e33985964c3e7acf6b9cd16d94a110e4f9a42d':
  Adjust for changes to libcore/Docs.mk
2015-10-26 10:11:23 +00:00
Neil Fuller
f961114997 Adjust for changes to libcore/Docs.mk
The paths in libcore_to_document are now relative to
the build root, not libcore.

Bug: 22023363
Change-Id: I75c86d6332e5eaedc67dd0d3207491aa91c02a5f
2015-10-21 16:47:04 +01:00
Phil Burk
61cf82778f am 92ae0a54: am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
  BLE-MIDI: change binding for BluetoothMidiService
2015-10-13 18:21:44 +00:00
Phil Burk
977fe03b36 BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
2015-10-13 15:40:03 +00:00
Jan Nordqvist
52eb29f082 Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.

Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
2015-09-22 17:24:22 -07:00
Vladislav Kaznacheev
ede5f5480e Handle content URI permissions on drop
Change-Id: I846071f01ecd1eff8e3a54a1806e68e1a4b335d2
2015-09-16 17:35:10 -07:00
Phil Burk
7cd06c0b9e BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
2015-09-08 13:48:16 -07:00
Michael Wright
56dafdb5ae am 7f7ffa37: am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '7f7ffa3722ef90a7bf5611221c4a4c9d06823a38':
  Add TabletModeChangedListener for SystemUI.
2015-09-03 17:37:10 +00:00
Michael Wright
7f7ffa3722 am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '87e4c951bf876faefad9f4223f6a568777425ae7':
  Add TabletModeChangedListener for SystemUI.
2015-09-03 14:30:27 +00:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Jorim Jaggi
6a89feae87 am 53c5dadb: am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
* commit '53c5dadbb8ddf0898e91e129aee4a19f1028175a':
  Add a private API to get notified about lockout resets
2015-09-01 16:10:10 +00:00
Jorim Jaggi
53c5dadbb8 am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
* commit 'd302508d2838000b1dde05d9bfaf5e5181dcf9dc':
  Add a private API to get notified about lockout resets
2015-09-01 01:05:39 +00:00
Jorim Jaggi
3a46478508 Add a private API to get notified about lockout resets
SystemUI uses it to start authentication again after lockout reset
expired.

Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
2015-09-01 00:37:54 +00:00
Daniel Estrada Alva
28fa6705bd am e4d61989: am f440fe06: am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
* commit 'e4d61989aebaee02b8b83f229418e7744278633f':
  Cherry-pick: Add callback-based support for HW Activity Recognition.
2015-08-26 17:56:18 +00:00
destradaa
e1a5144a1d Cherry-pick: Add callback-based support for HW Activity Recognition.
Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Bug: 17112184
Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-08-24 11:43:27 -07:00
Adrian Roos
e3b07451c3 resolved conflicts for merge of bcc26c02 to master
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
2015-08-21 18:08:58 -07:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
2015-08-22 00:40:47 +00:00
Adrian Roos
b5e4722891 Add StrongAuthTracker
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
Michael Wright
39e5e94744 Add TabletModeChangedListener for SystemUI.
Bug: 23256614
Change-Id: I6e5d636c24a84846cfad84da800911a469689dda
2015-08-21 17:12:22 +01:00
Joe Fernandez
feb6c0137a am b854bced: am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit 'b854bced88d7ca46284830d9f6b728e2f2363929':
  docs: Update developer docs make file to include API 23
2015-08-13 21:07:06 +00:00
Joe Fernandez
b854bced88 am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '9b8bc3dcba4aa0a2eb5cd3fcb19226c476e4b8d6':
  docs: Update developer docs make file to include API 23
2015-08-13 18:56:07 +00:00
Joe Fernandez
9f65f0a2c0 am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
  docs: Update developer docs make file to include API 23
2015-08-13 18:33:58 +00:00
Joe Fernandez
1827e3230d docs: Update developer docs make file to include API 23
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
2015-08-12 19:45:22 -07:00
Neil Fuller
ee94cfed71 am ce5f3e0f: am 14b884c1: am daf8d905: Merge "Add ICU as a java library for docs."
* commit 'ce5f3e0fe6714d3364c6b50ba768f58523661011':
  Add ICU as a java library for docs.
2015-08-08 02:48:54 +00:00
Neil Fuller
cf9b82518c am 14b884c1: am daf8d905: Merge "Add ICU as a java library for docs."
* commit '14b884c16ecf3a70999fcbd1862f6f1b38b24367':
  Add ICU as a java library for docs.
2015-08-07 21:16:51 +00:00
Neil Fuller
ce5f3e0fe6 am 14b884c1: am daf8d905: Merge "Add ICU as a java library for docs."
* commit '14b884c16ecf3a70999fcbd1862f6f1b38b24367':
  Add ICU as a java library for docs.
2015-08-07 21:12:51 +00:00
Neil Fuller
14b884c16e am daf8d905: Merge "Add ICU as a java library for docs."
* commit 'daf8d9056815b7435bdf4d07da3f938f11052691':
  Add ICU as a java library for docs.
2015-08-07 14:57:49 +00:00
Rayhaan Jaufeerally
2e47a6e5db Add ICU as a java library for docs.
Change-Id: Ifd5f0a076e2cbdf0498c209c916d5a55aa12f0ce
2015-08-03 13:56:06 +01:00
destradaa
6e2fe75624 Add callback-based support for Hardware Activity Recognition.
b/17112184

Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-07-27 13:40:21 -07:00
Jorim Jaggi
7840c0a071 am c1244a29: Merge "Touch, wake and unlock" into mnc-dev
* commit 'c1244a2995087c930842b7d5e5a35a446c5c40f7':
  Touch, wake and unlock
2015-07-22 20:16:55 +00:00
Jorim Jaggi
740452e875 Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
2015-07-20 23:52:20 +00:00
Ying Wang
bb5a76902d Merge "Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option." 2015-07-16 21:36:34 +00:00
Ying Wang
0f92a2e72f Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option.
So that the build system can clean up the stub out dir before
calling doclava.

Bug: 22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875
2015-07-16 14:20:22 -07:00
George Mount
a97d513ba2 am a38c0004: am bf6430a0: am 3d520403: am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit 'a38c00048e5f90e90dbad115d280f7e8a2dffe18':
  Add data binding to built javadoc.
2015-07-16 15:09:45 +00:00
George Mount
7f35b0d2cc am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '30c8245afc8d9558b76e5c86f917c22e02f6e820':
  Add data binding to built javadoc.
2015-07-16 14:29:44 +00:00
George Mount
3d52040359 am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '30c8245afc8d9558b76e5c86f917c22e02f6e820':
  Add data binding to built javadoc.
2015-07-16 14:29:38 +00:00
George Mount
30c8245afc Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:19:12 +00:00
Narayan Kamath
a82152aaf4 am 737106a6: am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '737106a61b0ceb2a6b92e7734b04900b174addce':
  docs: Add an explicit dependency on libcore/Docs.mk
2015-07-16 10:26:16 +00:00
Narayan Kamath
95b869e282 am 737106a6: am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '737106a61b0ceb2a6b92e7734b04900b174addce':
  docs: Add an explicit dependency on libcore/Docs.mk
2015-07-16 10:26:10 +00:00
Narayan Kamath
737106a61b am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233':
  docs: Add an explicit dependency on libcore/Docs.mk
2015-07-16 10:10:28 +00:00
Narayan Kamath
c21739aec8 docs: Add an explicit dependency on libcore/Docs.mk
We include libcore sources in apicheck / docs targets so we must
regenerate the stubs or api definitions whenever the list of libcore
sources changes.

Change-Id: I9383015069bc4064d5d06d3d540047cd408e24c7
2015-07-16 08:57:05 +00:00
Jorim Jaggi
4cfdcf5b05 Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I0c43bcc9d334b509632704fb0c123ab3351edff2
2015-07-14 21:05:26 +00:00
George Mount
a340f07670 Add data binding to built javadoc.
Bug 22175560

Change-Id: Ie57e0b77cade4b994ca2ef80cbf1a4c615a943f8
2015-07-13 16:45:34 -07:00
Paul Jensen
49e3edff51 Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
This new class replaces the awkward string token and ConnectivityManager APIs
used by apps handling captive portals.

Bug:21343774
Change-Id: I1a2c69edb17322715bf8422bb4216b0ea60bfd59
2015-07-09 10:47:34 -04:00
Svetoslav
cdfd230a39 Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.

bug:22104986

Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
2015-06-29 17:44:19 -07:00
Jeff Davidson
2a88031208 Default permissions for carrier apps.
Grant permissions in the PHONE and LOCATION buckets to default carrier
apps as defined by the telephony stack. Provide a system API to grant
default permissions for carrier apps, as the set of apps may change
when a new SIM is inserted.

Since the phone process is separate from the system process, we need
to allow for binder calls to these APIs.

Also fix a log tag that is too long (android.util.Log drops messages
silently if the tag is > 23 characters).

Bug: 21696731
Change-Id: I98ca0c49c69f621f835ba57c1fd0505f2cec0d0d
2015-06-23 09:55:23 -07:00
Svetoslav
f7c06eb03a Add system API to watch for permission changes
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
2015-06-10 21:24:13 -07:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev
* changes:
  API for get modem activity info
  Activity info and stats from modem
2015-06-08 23:44:51 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00