Commit Graph

13497 Commits

Author SHA1 Message Date
Sungsoo Lim
f861c77458 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev am: bfa6d23 am: 33de442
am: c0b10c2

* commit 'c0b10c2515f289495f854c045cdfca9e129ef2a0':
  MediaBrowserService: Provide a way to retrieve root hints

Change-Id: Ieca1f45e3f46a4719f9b7993fd1fe7a36b98dba5
2016-04-18 17:42:24 +00:00
Sungsoo Lim
bfa6d239b5 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev 2016-04-18 17:21:59 +00:00
Yi Kong
65b95b0a7d Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af
Bug: 28108421
Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0
(cherry picked from commit 418d3817a0)
(cherry picked from commit 88e9407fc4)
2016-04-18 10:29:39 +00:00
Yi Kong
88e9407fc4 Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af
Bug: 28108421
Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0
(cherry picked from commit 418d3817a0)
2016-04-18 10:55:44 +01:00
Hugo Benichi
e78f7544fd Merge "Make android.net.metrics Event classes @SystemApi am: 4b6dfc2 am: 9cae985" into nyc-mr1-dev-plus-aosp
am: ab317e3

* commit 'ab317e363f35e75cb64175707e6a4f058d95321e':
  Make android.net.metrics Event classes @SystemApi

Change-Id: Iaa17df5b1c40f399be22133ecddb3a2440023329
2016-04-18 04:25:20 +00:00
Hugo Benichi
4b6dfc2ef5 Make android.net.metrics Event classes @SystemApi
Bug: 28204408
Change-Id: I8ffe833213bbc03a7f70c51789f4899ee08f6e08
2016-04-18 11:36:42 +09:00
Makoto Onuki
36f4afbcca Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev am: e2be9f4
am: 2870094

* commit '2870094a86531e977898681aef503bb393b24a3e':
  ShortcutManager: Categories should be Set, not List.

Change-Id: I114c3ac304bed3b237128c2e330dec0fe19f6613
2016-04-16 15:28:06 +00:00
Makoto Onuki
e2be9f4a67 Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev 2016-04-16 15:18:39 +00:00
Jaesung Chung
6b056c6fd5 Merge "ExifInterface: keep the original metadata data instead of strings" into nyc-dev am: 865cef4
am: 468a079

* commit '468a0796cbed366d9db01c0e86e9429b51645842':
  ExifInterface: keep the original metadata data instead of strings

Change-Id: I6c7ab5441f6cb477bffc7953a61bc51e2af7e01b
2016-04-16 02:48:57 +00:00
Jaesung Chung
865cef475d Merge "ExifInterface: keep the original metadata data instead of strings" into nyc-dev 2016-04-16 02:41:23 +00:00
Amith Yamasani
d9af2fcd34 Merge "Address API review for UserManager user creation" into nyc-dev am: 25c66ac
am: 6797d86

* commit '6797d86d76ee193bc20809f118163a86eaf28b4b':
  Address API review for UserManager user creation

Change-Id: Ibfc33fcf16d958272b7dc6cad59e5ee557716706
2016-04-16 00:24:51 +00:00
Amith Yamasani
25c66ac8e6 Merge "Address API review for UserManager user creation" into nyc-dev 2016-04-16 00:18:22 +00:00
Makoto Onuki
be73a8068f ShortcutManager: Categories should be Set, not List.
Bug 27923857

Change-Id: Ife859da8e66478174f6c4463316886a23e5aa4e0
2016-04-15 17:15:29 -07:00
Jaesung Chung
0e7d22535d ExifInterface: keep the original metadata data instead of strings
This CL makes ExifInterface store the tag values as the original forms
and the format validiation is added that compares the given value and
the data format specificed in EXIF specification in order to keep the
valid tag values only.

Bug: 27583378, Bug: 27614052, Bug: 28075709
Change-Id: If60bbddefe74c4b87b4ce64b5fc79e467e36a5b9
2016-04-15 23:27:21 +00:00
Sungsoo Lim
51ccdb0f39 MediaBrowserService: Provide a way to retrieve root hints
Bug: 28075963
Change-Id: Id8993e67732a2dda5bf75ecab6037dbbba8c8c99
2016-04-15 14:37:36 -07:00
Amith Yamasani
0696434c62 Address API review for UserManager user creation
Don't return null from createUserCreationIntent()
Provide a way for apps to query if the device
supports multiple users.

Some additional documentation for UserManager class to
make things clear about the types of users and relationship
with accounts.

Change-Id: I768d816e73a1d7f61cdc415f9e482adc79e2715a
Fixes: 28150359
2016-04-15 14:10:02 -07:00
Tyler Gunn
be414324ae Merge "Hide multi-endpoint APIs." into nyc-dev am: d54c077
am: 5ee2dd9

* commit '5ee2dd9251d961167d5150bb2582e4d143aa4bc7':
  Hide multi-endpoint APIs.

Change-Id: Ia516afdedc79284116f99b9bcd153b3fca841566
2016-04-15 20:41:47 +00:00
Tyler Gunn
d54c077d08 Merge "Hide multi-endpoint APIs." into nyc-dev 2016-04-15 20:28:57 +00:00
Jeremy Joslin
54e7ccf876 Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev am: e9f5cd3
am: e0afa2c6

* commit 'e0afa2c6abc16938f5c889fd96c0eda4202e55bd':
  Added useExternalScores field to WifiConfiguration.

Change-Id: Ia0600675e2648cb5ec5784ef786eb21c1209305a
2016-04-15 20:27:30 +00:00
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
Jeremy Joslin
e9f5cd3784 Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev 2016-04-15 20:14:03 +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
Tyler Gunn
1bf206b766 Hide multi-endpoint APIs.
Per feature council decision, the multi-endpoint APIs will be @hide for
the N release.

Bug: 28196918
Change-Id: Ia80b089bc754ce87ca208382eb79442b5265844d
2016-04-15 11:28:44 -07:00
Jeremy Joslin
fc8601310d Added useExternalScores field to WifiConfiguration.
Bug: 25562019
Change-Id: Ie3b02875b74f6decb1d4be0107a5a8161f66d657
2016-04-15 09:10:46 -07: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