Commit Graph

13475 Commits

Author SHA1 Message Date
Steve Malkos
a2614dd6cc Merge "Expose RTT capability APIs for secure RTT." into nyc-dev am: 53afdf2
am: 0330f40

* commit '0330f40745b64546c7fa8a1bb1c83c2a152a932f':
  Expose RTT capability APIs for secure RTT.

Change-Id: I5c4d7c0ebd4ee28ddef38f69291353b78c16125e
2016-04-15 20:20:53 +00:00
Steve Malkos
53afdf2935 Merge "Expose RTT capability APIs for secure RTT." into nyc-dev 2016-04-15 20:03:22 +00:00
Pavel Zhamaitsiak
ccfa19f139 Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev am: 74870c4
am: 229e517

* commit '229e5179ba1915b5beb86b0d7989fb356bef9966':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Ia33ecf02187f0c945c0e70d6d939c310cca3c6e1
2016-04-15 18:57:18 +00:00
Pavel Zhamaitsiak
f6f24c03f3 Make ConnectivityMetricsLogger and related classes @SystemApi
Bug: 25691077
Change-Id: Ia98d0a52a9541d9ae773be2b0e962d609f9dd7ee
2016-04-14 19:15:23 -07:00
Wei Wang
cae1be2200 Expose RTT capability APIs for secure RTT.
Bug: 28199253
Change-Id: I790b72a365f788ef225566e7fc13b3e097f346b2
2016-04-14 15:47:42 -07:00
Dongwon Kang
9752d2fd09 Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev am: 7f5b3e5
am: d523768

* commit 'd52376853da8b0b42f19e8129a59f269c2565646':
  TIF: Add Programs.COLUMN_RECORDING_PROHIBITED

Change-Id: I3acc697c147284ea405564a99fe1292841c17d51
2016-04-14 20:53:43 +00:00
Dongwon Kang
7f5b3e59d1 Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev 2016-04-14 20:13:58 +00:00
Amith Yamasani
757d9846b5 Merge "Multi-window assist callback" into nyc-dev am: 0d723a2
am: bb541ff

* commit 'bb541ffe5e9eda03d51cdb720259e0aeced11e37':
  Multi-window assist callback

Change-Id: I63f2c5294664ee9de34b73f2815c9214d9d3f270
2016-04-14 20:12:06 +00:00
Alan Viverette
c45735d09a Merge "Make number picker styles public" into nyc-dev am: 487bcec
am: 1ba5764

* commit '1ba57645d55f41edd124db323f58205a72544a73':
  Make number picker styles public

Change-Id: I4d5703aeac6de634157f0b9989bba6c6fe2136db
2016-04-14 20:11:42 +00:00
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +00:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Dongwon Kang
7c12cd3ae4 TIF: Add Programs.COLUMN_RECORDING_PROHIBITED
Bug: 28039913
Change-Id: I30897f164113ceb422c8c5a16448b8b296a5a68a
2016-04-14 11:05:07 -07:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
2016-04-14 10:27:31 -07:00
Alan Viverette
b9e6ad32bd Make number picker styles public
Bug: 28189144
Change-Id: Ic1825c211bf76ea8b063996895f4a273ac0c7fd4
2016-04-14 13:01:41 -04:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Kirill Grouchnikov
698b751dc7 Add @TestApi-guarded way to get bounds of specific day in CalendarView
Two separate implementation paths, one for Material look / layout, and
one for legacy / pre-Material one.

Bug: 28037149
Change-Id: Id1946802c0a93218d9eb0b73c81ad76dc027763c
2016-04-14 08:47:05 -04:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Amith Yamasani
e8222e551f Multi-window assist callback
Introducing a new callback in VoiceInteractionSession to
provide assist data for additional activities in the
foreground in a multiwindow setup.

PIP, docked windows and free-form windows (top-most)
will be queried for assist data and passed through the
new API to the Voice Interaction service.

Bug: 27718385

Change-Id: Ib4427c304611b75c2078dcb54f1f7e47ae7d9cfa
2016-04-13 17:12:29 -07:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Sudheer Shanka
38e0c19717 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev am: fd580f7
am: 0306304

* commit '03063041002228b247d68a53198c76824a8d30f3':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: I1ea3d55c212811c118c8912fe8a8efa302938e60
2016-04-13 20:24:59 +00:00
Sudheer Shanka
fd580f7d1a Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev 2016-04-13 20:12:05 +00:00
Sudheer Shanka
fe7184e5b2 Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev am: b53a36b
am: dab38b0

* commit 'dab38b0aaa5086656b519f3fe636f6619228bc29':
  Add an intent action ACTION_SHOW_APP_INFO.

Change-Id: Iad5fe29e6b7874fe63cc04636a2c91ddc9c14650
2016-04-13 18:01:00 +00:00
Dianne Hackborn
8db0fc15b8 More work on issue #26390151: Add new JobScheduler API...
...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: If3fdff23c00c2f1b99901a9be096d851562d3439
2016-04-13 10:54:16 -07:00
Sudheer Shanka
b53a36b8cf Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev 2016-04-13 17:47:07 +00:00
Michal Karpinski
dc8ac6fbb5 Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef
am: 96d49b1

* commit '96d49b1ac6e197f64103e5454e308f65609b2853':
  API polish in DPM for organization color and name methods

Change-Id: I90b74fa1b0c3e2961fb26fc5e84e85d5bc5da1f5
2016-04-13 13:40:03 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Clara Bayarri
a0c2dc3cf5 Provide startIntentSenderForResult for fragments
Bug: 27700608
Change-Id: Ibb7689ba0527048dd5944c4315b986f16030081d
2016-04-13 12:33:30 +01:00
Dongwon Kang
5e3c6801f4 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev am: 4c3dcc0
am: 4655cdd

* commit '4655cdd5c3ddf378eb134649e659e2dece973c83':
  TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()

Change-Id: I6a413c97013430638ede5aa90099a54be0ecc770
2016-04-13 02:01:14 +00:00
Eino-Ville Talvala
552781c9c0 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev am: 777c4e7
am: d848ebb

* commit 'd848ebb7a5930a8ad6c93efd2b8b0ccf2116a664':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I10d13c49771baea1968d79a5359deaaca1697e5d
2016-04-13 02:00:38 +00:00
Dongwon Kang
4c3dcc0a16 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev 2016-04-13 00:36:35 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Dongwon Kang
e9db0e1ed1 TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
2016-04-12 16:44:40 -07:00
Makoto Onuki
a9a8d44cdc Merge "ShortcutManager: Address API review feedback." into nyc-dev am: 1d616f0
am: 9d25ead

* commit '9d25ead98b6b09611fd95dfdd2b49ef5191ea030':
  ShortcutManager: Address API review feedback.

Change-Id: I663034ac1ae3bdb7b0757efae0396235784b8dce
2016-04-12 23:07:29 +00:00
Sunny Goyal
0a6fc940d7 Merge "Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev am: 1fe7dfa" into nyc-dev-plus-aosp
am: 411d2f9

* commit '411d2f97054a1265a117c2bcdf8f83683846d73b':
  Changing LauncherApps to resolve activity by component name

Change-Id: I9fc47dfb6e801ab30babc012ff82011c48ab57b5
2016-04-12 22:41:37 +00:00
Felipe Leme
877d517b4f Merge "Merge "Make getStorageVolume(File file) public." into nyc-dev am: 93c442e" into nyc-dev-plus-aosp
am: d5ce189

* commit 'd5ce189a6924245cc924a3289d4006cc48d2994b':
  Make getStorageVolume(File file) public.

Change-Id: I98f6fee2a1a0b8ad709bba0f554c79f61921df1c
2016-04-12 22:41:12 +00:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Eino-Ville Talvala
fa5e2a156d Camera/Surface: Update OutputConfiguration API
- Rename "surface set ID" to "surface group ID"
- Remove setSurfaceSetId
- Use constructor overloads to set surface group ID, make
  OutputConfiguration immutable
- Add Surface.getConsumerDescriptor to make it possible to verify
  if two Surfaces have the same backing consumer
- Cache initial surface generation ID in OutputConfiguration so that
  changes in a Surface's internals will label it is as a
  new output
- Add sample use case for surface group IDs

Bug: 27950763
Bug: 28076469
Change-Id: I13251d1dd3d26a978ffbedc519966524e93bc61c
2016-04-12 14:51:17 -07:00
Sunny Goyal
1fe7dfa66a Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev 2016-04-12 20:55:32 +00:00
Felipe Leme
93c442e44f Merge "Make getStorageVolume(File file) public." into nyc-dev 2016-04-12 20:44:06 +00:00
Makoto Onuki
b6d3523dfb ShortcutManager: Address API review feedback.
- "delete" -> "remove"
- add/deleteDynamicShortcut() now takes a list.
- Throttling default settings is now 2 calls / hour.

- Add categories to ShortcutInfo.
- getIconResourceId() is now public

Bug 27923857
Bug 27548047

Change-Id: I8457b30e4b2f7c63ab2988648b37178fd16ea45b
2016-04-12 10:35:20 -07:00
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
2016-04-12 17:29:39 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Yi Kong
0755fc6c61 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
(cherry picked from commit 05a77eee41)
2016-04-12 17:12:26 +01:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Yi Kong
05a77eee41 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
2016-04-12 15:45:10 +01:00
Michal Karpinski
74cd73079c API polish in DPM for organization color and name methods
- Returning and accepting CharSequence instead of String
- Enforcing 100% opacity and adjusting javadocs for color
format
- Adding @ColorInt annotations

Bug: 27531295
Change-Id: Id27d4fd5e7bb4d746cc61288457eb4eb86224505
2016-04-12 15:17:52 +01:00
Shubham Ajmera
aeeabf072f Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev am: 68b19f2
am: 0983951

* commit '098395171952abb0a2fd8bdeb5ecb7b8f5d8b2f4':
  Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00

Change-Id: I10b7b20ca7cd96b57c68a85377e6ea8ba4c83546
2016-04-12 12:38:31 +00:00
Kirill Grouchnikov
e1684cda2b Merge "Add @TestApi method to Spinner to test whether popup is showing." 2016-04-12 12:29:08 +00:00
Shubham Ajmera
a871ab1687 Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Bug: 27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
2016-04-12 10:10:25 +01:00