Commit Graph

247505 Commits

Author SHA1 Message Date
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
Gustav Sennton
35562f764b Verify WebView package info before loading WebView am: cd8f273
am: 9e5a257

* commit '9e5a25702d1d00864b94915944af68d9b92712ef':
  Verify WebView package info before loading WebView

Change-Id: I18d87f83b46366169d6c6dbd9a1b7225e3d1a173
2016-04-14 19:29:22 +00:00
Niels Egberts
4f5fa52151 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev am: e767e1b
am: 3feb21c

* commit '3feb21c44ff82c4ddac7777246dc1b68fe52b6a0':
  Fix issue when QUEUE_DESTROY arrive at the same time.

Change-Id: I445c2697a87f87182e57fc77537932a536b80ed3
2016-04-14 19:28:53 +00:00
Gustav Sennton
efdd58b1df Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev am: 45e2966
am: c08ac79

* commit 'c08ac79a21722bf793d328e652e6f64118d90fca':
  Update persistent WebView packages setting only when user changes it.

Change-Id: Ied22fed362a718cff0b1892dc199ac74e336de03
2016-04-14 19:28:23 +00:00
Gustav Sennton
9a98665504 Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev am: f014c74
am: 666bdef

* commit '666bdefa2726ab2f5d93b3058a29c7fb81bd749f':
  Ensure at least one default-available webview package is a non-fallback

Change-Id: Ib7943ba13f9760bf8385829c699066058d23acc8
2016-04-14 19:27:53 +00:00
TreeHugger Robot
ceac5dd9de Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
2016-04-14 19:26:50 +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
Michael Wright
ac1534aed1 Merge "Change storage duration to static for native choreographer." am: a1ef6e7 am: 106b00d
am: 36ebd40

* commit '36ebd405aacd2139605f809c4d508935bbf72a31':
  Change storage duration to static for native choreographer.

Change-Id: I2b84694a59d4a13f35d05d58c6b6bef9e643007d
2016-04-14 19:25:35 +00:00
Michael Wright
1ab01fb331 Merge "Add choreographer API to the NDK." am: 2853711 am: 6d53167 -s ours
am: c5aeb8d

* commit 'c5aeb8d867559a1899d5337f030741a68c3b4fce':
  Add choreographer API to the NDK.

Change-Id: I8118a0ccd7dcd666ce6a3c37ae1d02c96c7a6037
2016-04-14 18:53:14 +00:00
Bernard Chau
60b73587bb Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7
am: d17b301

* commit 'd17b3013ce7bd38aaf16d1ffd578d964bfd1808a':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I85630c13799c9bbaa558a0f1582691f7a00e0b86
2016-04-14 18:52:53 +00:00
TreeHugger Robot
e520696d9c Merge "Filter out ACTION_UP events in onKey() listener." into nyc-dev am: 73ba4a7
am: ece4430

* commit 'ece44304affd94e7a5477c99d2f493108e19bf91':
  Filter out ACTION_UP events in onKey() listener.

Change-Id: I1e1407897ac4c1200eed631bf9473f31f5ace631
2016-04-14 18:52:24 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
2016-04-14 18:52:01 +00:00
Pierre Imai
87421a21c7 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
2016-04-14 18:51:38 +00:00
Jaewan Kim
db16ecdb3f Merge "PIP: Fix runtime crash in System UI" into nyc-dev am: a6d383d
am: a6d0da0

* commit 'a6d0da0662258d66ee04bfd433872d8d528d7721':
  PIP: Fix runtime crash in System UI

Change-Id: I4b7b03ecc2bb1021bb9d2624024f703639ed2661
2016-04-14 18:50:38 +00:00
Zhijun He
497280cac9 Merge "Camera: clarify lens shading map" into nyc-dev am: 15aac69
am: a197627

* commit 'a19762765d099acf9cd81105343f857b8845788d':
  Camera: clarify lens shading map

Change-Id: I8adc602a08dbb5521f57319fd2a80bffb305ef82
2016-04-14 18:49:55 +00:00
Hugo Benichi
9536eac1b7 Merge "Add volatile qualifier to boolean variable" into nyc-dev am: fbd47ca
am: 1b6f396

* commit '1b6f396978df419b20e302142171b48a477c9c1c':
  Add volatile qualifier to boolean variable

Change-Id: I78bc22e8c5991c5b18cec761f42dbdcfe8d4cfe8
2016-04-14 18:49:23 +00:00
Yuki Awano
2a68999d4f Do not update accessibilityTitle in LayoutParams.setTitle am: 0697c7a
am: b28d871

* commit 'b28d871a8dc1ae3f78ac6587272f8c8454718188':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: Ie6ce4e042ea3a14e7ed66dad89f4d879e128869b
2016-04-14 18:48:54 +00:00
Dianne Hackborn
82d2b16135 Merge "Fix issue #28156248: Receiving connectivity receiver..." into nyc-dev am: 37ce022
am: 77f20d8

* commit '77f20d8026a2b1475e93681d38ada81879216d52':
  Fix issue #28156248: Receiving connectivity receiver...

Change-Id: I7d39045a9fb552cea0ac633a9310d19c8107143b
2016-04-14 18:48:20 +00:00
TreeHugger Robot
42de05b970 Merge "Limit don\'t dispatch when non-interactive and the display is off to watches" into nyc-dev am: 015e42a
am: 3aef23e

* commit '3aef23e885957310ad27fcf20f11bf4f999edc5a':
  Limit don't dispatch when non-interactive and the display is off to watches

Change-Id: If6c696be7cdad708b9710067a2969171175d1029
2016-04-14 18:47:09 +00:00
Winson
c565c6164a Reducing work on configuration change (Part 1) am: 670ea71
am: 5913a15

* commit '5913a156a2e88a259b7648a8515701d0bf3e744c':
  Reducing work on configuration change (Part 1)

Change-Id: I102dfe3ad9f20489e6bf9959790da770b40065c2
2016-04-14 18:46:31 +00:00
TreeHugger Robot
b03419e212 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev am: f824e58
am: 48f8f29

* commit '48f8f2951bf54dcf998916e915e150f782088c71':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Idda93d8b3c1b3d6a12d3958627fb291f647b18dd
2016-04-14 18:45:53 +00:00
Alan Viverette
3d7cabbf5a Merge "Add scroll indicators to resolver list" into nyc-dev am: 8bb7ad5
am: 3b049bb

* commit '3b049bb17fd10357005a069c0693c6d50c0023df':
  Add scroll indicators to resolver list

Change-Id: I984a1344f3f4d5861d276bba6a1cc94217b6a688
2016-04-14 18:45:16 +00:00
Jaewan Kim
442f0910c6 Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev am: 6309cab
am: b5948bd

* commit 'b5948bd877639f64ab4d9b3b2611729b0cb2665b':
  PIP: Implement focus change animation in PIP control buttons

Change-Id: Ide2739cb58c391a6689387604aef1f999f8797f0
2016-04-14 18:44:11 +00:00
Winson
9f48a791ab Fixing crash. am: f21c3dac
am: 5ab0315

* commit '5ab0315adc4310229e80e545e3129bc8ec4564cf':
  Fixing crash.

Change-Id: I3f99324bbd0377c5d81ca1ee651ae553eab11a7e
2016-04-14 18:43:22 +00:00
Jaewan Kim
0218733f7d Merge "PIP: Add PIP boundary" into nyc-dev am: 49d9c79
am: 4088fb2

* commit '4088fb2f98c8ba035f016fdea087bfae655313ee':
  PIP: Add PIP boundary

Change-Id: I058c5a049fe99b7dbc189b205dbd745e1273c40d
2016-04-14 18:42:44 +00:00
Steve McKay
e3ffcfd844 Merge "Minor cleanups to delete support." into nyc-dev am: 282c458c
am: 2c94cc1

* commit '2c94cc12c455841657f0f2ffd4d6083269140de0':
  Minor cleanups to delete support.

Change-Id: Ia7365eebcc78c6950b9009a0eb87bb3de894fe52
2016-04-14 18:42:08 +00:00
TreeHugger Robot
560c988aca Merge "Keep HUNs that have an active remote input" into nyc-dev am: e6036ad
am: d9d7085

* commit 'd9d70858b0e42a4b7ea1c64d5f4ebf2bfec62e44':
  Keep HUNs that have an active remote input

Change-Id: I7287501646f7117feb2f3ac4d0ba0b9e046d42f9
2016-04-14 18:41:07 +00:00
Carlos Valdivia
fb0229596d Merge "Improve CryptoHelper" into nyc-dev am: 2cde05c
am: b6aa48a

* commit 'b6aa48a469820c2a92b46d4ebf2b89f97511094a':
  Improve CryptoHelper

Change-Id: I11bddcaf6ceb0a5473e384137fff8ff8c4dd698c
2016-04-14 18:40:12 +00:00
Julia Reynolds
b14349b146 Merge "Allow notification listeners full DND access." into nyc-dev am: 5776729
am: c19ce28

* commit 'c19ce2808dff16f614b753452d3dcf4473b4bfdf':
  Allow notification listeners full DND access.

Change-Id: I92007cd4628b36f8257f9ddbd4ddef968e88b1f0
2016-04-14 18:39:33 +00:00
TreeHugger Robot
1d03aedd7d Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev am: 0a97f22
am: 5b2e531

* commit '5b2e5316d87227cce9e6e5054d98dfd7c60602ac':
  Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: Ie392d4d5baafc25a8384f4cdb0b9306bce26d031
2016-04-14 18:38:50 +00:00
Erik Kline
5617fece1b Merge "Also consider loss of IPv6 default route to be fatal" into nyc-dev am: 7596e9c
am: 47719fc

* commit '47719fc1b0794a6c9ae243eba931fcd101702c33':
  Also consider loss of IPv6 default route to be fatal

Change-Id: I5fb5dc597edffd5866a86524461a74f09e64e0b1
2016-04-14 18:37:12 +00:00
TreeHugger Robot
382987244e Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev am: c1699a9
am: f917e2f

* commit 'f917e2f738f25bcf34ffa073008e872d803458e1':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I4273c7fe4511b8a542f15b604387e6f27ee6d676
2016-04-14 18:36:38 +00:00
Jan Nordqvist
6ee90b5eee Merge "Fixed incomplete OSEN config code." into nyc-dev am: 82f3053
am: c9c4f97

* commit 'c9c4f9771665f9a64512cd399cb86600a7be3f02':
  Fixed incomplete OSEN config code.

Change-Id: I42c9809b86a55c3bb6e04b78f82d7e74cfc007d0
2016-04-14 18:35:56 +00:00
TreeHugger Robot
822ced9504 Merge "TIF: More annotations" into nyc-dev am: a38b4ef
am: d3e9311

* commit 'd3e93119a0e52b0fe0046b47eee7c2f5613c8113':
  TIF: More annotations

Change-Id: Ica3a63d8d4c687b3df02a97c10cfbe6f99c30c6a
2016-04-14 18:35:20 +00:00
TreeHugger Robot
71f8c4c475 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev am: c142a8c
am: 69df48c

* commit '69df48c44602f0ab64725dd82444fda23bc7f2bf':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Idf437251b407c2682e6f52608031178aa1040eeb
2016-04-14 18:33:55 +00:00
TreeHugger Robot
cf9b45a645 Merge "Remove deprecated API for sim authentication." into nyc-dev am: d274486
am: d4844d5

* commit 'd4844d5b6b61a01f09dee43939ac1d67f12a5805':
  Remove deprecated API for sim authentication.

Change-Id: I94f6df7347ed6f418ab62812682a53ea5259ff5a
2016-04-14 18:33:08 +00:00
TreeHugger Robot
1327cafb6b Merge "Added Data Saver Mode description." into nyc-dev am: 21e7e1e
am: 8a31402

* commit '8a31402c5d8e9927ae496e8515ffcb4287aceca1':
  Added Data Saver Mode description.

Change-Id: Ibea5dd2c9d5d2af190182afa610f1d6923d36a49
2016-04-14 18:32:19 +00:00
Lifu Tang
ad21e70a7d Merge "Fixed bugs when deliver GnssMeasurement from N-HAL" into nyc-dev am: ceeb44d
am: 53ca6bf

* commit '53ca6bfe5880fddb75cb382ec991376459b6e739':
  Fixed bugs when deliver GnssMeasurement from N-HAL

Change-Id: Ieb217f84e2796e6a9f7ecd26c50cad98ce0b82f2
2016-04-14 18:30:51 +00: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
Dan Sandler
73a694b486 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
am: 3af45bd

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

Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Gustav Sennton
9e5a25702d Verify WebView package info before loading WebView
am: cd8f273

* commit 'cd8f2737cc550ef1461c74a5c748777fa0c97379':
  Verify WebView package info before loading WebView

Change-Id: I75b306ddc59ace1a5d6613a0fbdb0c8c801333c2
2016-04-14 13:59:17 +00:00
Daniel Sandler
3af45bd2d0 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev 2016-04-14 13:53:19 +00: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
Gustav Sennton
cd8f2737cc Verify WebView package info before loading WebView
To ensure that the package we are using to load WebView is a valid
provider we need to verify this before loading WebView - not only when
choosing what package to use.

Bug: 27900925
Change-Id: If57ca32a7a3fa08735a3b8ea9ed268c1bb1b8ede
2016-04-14 14:19:07 +01: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
Niels Egberts
3feb21c44f Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
am: e767e1b

* commit 'e767e1bc17eeb4302ef503bcc83ed8697db91433':
  Fix issue when QUEUE_DESTROY arrive at the same time.

Change-Id: Ic1d42d8b74ec27be4a3d57c3df8c221d5907c739
2016-04-14 12:39:21 +00:00
Niels Egberts
e767e1bc17 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev 2016-04-14 12:33:05 +00:00
Gustav Sennton
c08ac79a21 Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev
am: 45e2966

* commit '45e2966da9f81077777bb6df61e9a880790741ec':
  Update persistent WebView packages setting only when user changes it.

Change-Id: I8cc5ad1e7bd0dae467413362a23dc803e5aab9ee
2016-04-14 11:05:33 +00:00
Gustav Sennton
45e2966da9 Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev 2016-04-14 10:58:42 +00:00
Gustav Sennton
666bdefa27 Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev
am: f014c74

* commit 'f014c74ec4070f1c903bbb8ac82d80b2ddbfe306':
  Ensure at least one default-available webview package is a non-fallback

Change-Id: I2128b569cdb414b9ae8d4b15baa36d4e8919a9db
2016-04-14 10:32:15 +00:00