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

16829 Commits

Author SHA1 Message Date
Amith Yamasani
927232ebe6 Merge "BLE scan API using PendingIntent" into oc-dev am: 7859022e8e 
am: 3eca1577fe

Change-Id: I226c5a770d41e3d096658da3148a4089fa3a29f3
 2017-04-15 01:47:05 +00:00
Amith Yamasani
3eca1577fe Merge "BLE scan API using PendingIntent" into oc-dev 
am: 7859022e8e

Change-Id: Ic694cf7dae7e7c151155787da5b079699cec93ed
 2017-04-15 01:41:29 +00:00
TreeHugger Robot
7859022e8e Merge "BLE scan API using PendingIntent" into oc-dev 2017-04-15 01:34:08 +00:00
Dianne Hackborn
9ffd026cac Merge "Introduce a new JobServiceEngine class." into oc-dev am: aaeb512331 
am: 09d3418582

Change-Id: Id5a22d0d77f76cfeb85048dcc9e02edc5773e57d
 2017-04-15 01:27:26 +00:00
Philip P. Moltmann
64429fe511 Merge "Remove autofillMode attribute" into oc-dev am: a05f1fdd93 
am: a624433bf0

Change-Id: Idd7b711a67378287eb5a6da3374f2d84e4710a8c
 2017-04-15 01:22:16 +00:00
Sudheer Shanka
c5827c0a1a Merge "Add new api Activity.getStartInitiatedTime." into oc-dev am: 2359f016e2 
am: 225e594388

Change-Id: I64b956ebf369aa19e42920d71fdcac7713ce2c32
 2017-04-15 01:18:27 +00:00
Amith Yamasani
ded55c6ed7 Merge "MASTER_CLEAR action should not be public" into oc-dev am: baf1d7036e 
am: 6c608ebafb

Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a
 2017-04-15 01:17:16 +00:00
Dianne Hackborn
09d3418582 Merge "Introduce a new JobServiceEngine class." into oc-dev 
am: aaeb512331

Change-Id: I68e306a970096cdd7d65b13865f70081679759ec
 2017-04-15 01:02:31 +00:00
Philip P. Moltmann
a624433bf0 Merge "Remove autofillMode attribute" into oc-dev 
am: a05f1fdd93

Change-Id: Ib5a661b27a23e7dbaa277a3d3ea1d85a4ab7ba72
 2017-04-15 00:56:44 +00:00
Dianne Hackborn
aaeb512331 Merge "Introduce a new JobServiceEngine class." into oc-dev 2017-04-15 00:55:55 +00:00
TreeHugger Robot
a05f1fdd93 Merge "Remove autofillMode attribute" into oc-dev 2017-04-15 00:50:51 +00:00
Makoto Onuki
58105199f5 resolve merge conflicts of 25e893c7d5d3 to master 
Test: build

Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f
 2017-04-14 17:19:17 -07:00
Sudheer Shanka
225e594388 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev 
am: 2359f016e2

Change-Id: I8a2ab94f67894736188fd62df8503dfa637ad9ed
 2017-04-15 00:17:26 +00:00
Sudheer Shanka
2359f016e2 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev 2017-04-15 00:09:32 +00:00
Amith Yamasani
6c608ebafb Merge "MASTER_CLEAR action should not be public" into oc-dev 
am: baf1d7036e

Change-Id: I361e8369ec16da7d032680530223463228921616
 2017-04-14 23:57:05 +00:00
TreeHugger Robot
baf1d7036e Merge "MASTER_CLEAR action should not be public" into oc-dev 2017-04-14 23:50:26 +00:00
Makoto Onuki
25e893c7d5 Merge "Fix the wrong IMPORTANCE_ values." into oc-dev 
am: 5f085792f6

Change-Id: I263f5cd22bf45a0b7f2f8599d28807e6464a5c2c
 2017-04-14 23:39:03 +00:00
Eugene Susla
ac4e846ccd [DO NOT MERGE] Add an opnion to use advertised name for renaming 
am: 75fb821029

Change-Id: Iead08333400d2ddc0568ae3b7f09f6ccb7fdbc1f
 2017-04-14 23:31:53 +00:00
Makoto Onuki
5f085792f6 Merge "Fix the wrong IMPORTANCE_ values." into oc-dev 2017-04-14 23:29:11 +00:00
Eugene Susla
75fb821029 [DO NOT MERGE] Add an opnion to use advertised name for renaming 
Test: Use new API, make sure renaming works
Change-Id: I9251c5db24495b8594fadce2beab3347a1aec884
 2017-04-14 23:19:42 +00:00
Amith Yamasani
461111bc3d BLE scan API using PendingIntent 
This allows apps to listen for beacons, etc., without having to
run a foreground service and register a callback. They can instead
register a PendingIntent which will be fired when scan results
are available or when an error occurs.

Bug: 37254611
Test: WIP
Change-Id: I1793eee67ff0211370ed6fc38be4d95a4c5853f5
 2017-04-14 16:16:42 -07:00
Dianne Hackborn
579f75c8a4 Introduce a new JobServiceEngine class. 
This allows any service to interact with JobScheduler, which
should give us a lot more opportunity to do interesting stuff
in the support lib.

Test: bit CtsJobSchedulerTestCases
Change-Id: I0843e8b212a0a63a17558b837b899b90cac22805
 2017-04-14 15:56:47 -07:00
Amith Yamasani
e99757e4b1 MASTER_CLEAR action should not be public 
Limit it to SystemApi, for passing intent tests

Bug: 36977779
Test: cts test
Change-Id: I716b94fc3cef43db1fafbfdad8dba0d850bec474
 2017-04-14 14:41:45 -07:00
Philip P. Moltmann
44a4336027 Remove autofillMode attribute 
Bug: 36171235
Test: CtsAutoFillServiceTestCases
Change-Id: I69f0e1c4fa3c68f73049726e7ae8f10d9d81bf5e
 2017-04-14 14:35:14 -07:00
Sudheer Shanka
bc308988bd Add new api Activity.getStartInitiatedTime. 
This api will return the timestamp at which this activity start was last
initiated by the system. Implementation is wip.

Bug: 9058261
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t \
      android.app.cts.ActivityStartTimeTest

Change-Id: I396458ecefbb09108f414b95f9c0beb6d609a4e1
 2017-04-14 14:19:25 -07:00
Romain Guy
908370bb27 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7 
am: f713a1960e

Change-Id: Ie1d361e946cf68ba97352ef6946f9d82ed5b784b
 2017-04-14 21:19:25 +00:00
Romain Guy
f713a1960e Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 
am: c99bcc69f7

Change-Id: I016c2b265dc471b74cd703281b3de60d7e54bfea
 2017-04-14 21:14:10 +00:00
Romain Guy
c99bcc69f7 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 2017-04-14 21:08:42 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
 2017-04-14 20:21:17 +00:00
Christopher Tate
ff2c721bff Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 
am: 09414003f5

Change-Id: Ibe8fb54fd2b10227e08d887b69767d472c098b7e
 2017-04-14 19:19:19 +00:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
 2017-04-14 19:09:27 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Vikas Marwaha
8b5315f588 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b 
am: 358ec57382

Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9
 2017-04-14 18:36:10 +00:00
Dongwon Kang
625df43c5c Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874 
am: 294176e988

Change-Id: I7332f731883c94f49477258357b3b392b4e21961
 2017-04-14 18:27:05 +00:00
Alan Viverette
568b59c62c Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89 
am: 2de6b0dab0

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
 2017-04-14 18:24:27 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
 2017-04-14 18:13:49 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede 
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
 2017-04-14 18:01:24 +00:00
Andrii Kulian
7ce72dac6d Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am: c66b6ff997 
am: aa412973d9

Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222
 2017-04-14 17:46:46 +00:00
Dmitry Dementyev
25b5fa9d79 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 
am: 0bf753d2e5

Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
 2017-04-14 17:33:46 +00:00
Romain Guy
95648b8a59 Add BitmapFactory.Options.inColorSpace 
This allows applications to load bitmap in a preferred
target color space, similar to inPreferredConfig for
configurations.

This change also applies recent changes made to BitmapFactory
to BitmapRegionDecoder: support for outColorSpace, inColorSpace
and outConfig.

Bug: 32984164, 36905374
Test: CtsGraphicsTestCase (BitmapColorSpaceTest/BitmapRegionDecoderTest)
Change-Id: I4eded9190d1aa9c7f3033f9bb78a6854cc48a3ef
 2017-04-14 10:14:27 -07:00
Dongwon Kang
294176e988 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 
am: 0cdc7c8874

Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
 2017-04-14 17:13:49 +00:00
Dongwon Kang
0cdc7c8874 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 2017-04-14 17:05:31 +00:00
Ta-wei Yen
27a931eb69 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711 
am: 63668e4396

Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
 2017-04-14 17:03:34 +00:00
Dianne Hackborn
52a29573ee Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542 
am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
 2017-04-14 16:48:32 +00:00
Makoto Onuki
d7e405851f Fix the wrong IMPORTANCE_ values. 
Bug: 36697597
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t android.app.cts.AlertWindowsTests

Change-Id: I3327d4668470400e8b30faeebb77534eeb2583ed
 2017-04-14 09:47:54 -07:00
Jeff Tinker
835a765a3a Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51 
am: a29ecc1a1c

Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
 2017-04-14 16:46:07 +00:00
jiabin
cc6759b193 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am: 2ec7decaa5 
am: 4f499a0a17

Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
 2017-04-14 16:36:01 +00:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev 
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
 2017-04-14 16:33:14 +00:00
Peng Xu
3242ee7920 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am: 5ebb159a92 
am: 70004dd19c

Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
 2017-04-14 16:28:04 +00:00