Commit Graph

68421 Commits

Author SHA1 Message Date
Andreas Gampe
8f4731db63 Merge \\"Revert \\"Frameworks/base: Refactor UserHandle and Environment a bit\\"\\" into nyc-mr1-dev am: 56177bf81b
am: 5c1dc014ca

Change-Id: Ia51a5349ea826ca56ec0c5f8baf1c1afac7c6b81
2016-07-08 18:27:10 +00:00
Andreas Gampe
5c1dc014ca Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
am: 56177bf81b

Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
2016-07-08 18:19:33 +00:00
Andreas Gampe
56177bf81b Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev 2016-07-08 18:09:54 +00:00
TreeHugger Robot
1404b09938 Merge "Docsui-level work for implementing Eject on Roots list." 2016-07-08 15:24:58 +00:00
Andrei Stingaceanu
a024ebf33a Merge "TimePicker - introduce hidden methods for CTS testing" 2016-07-08 15:23:46 +00:00
Andrei Stingaceanu
4689cd9567 Merge "CalendarView Material - throw exception if date is out of range" 2016-07-08 15:13:26 +00:00
Suprabh Shukla
8a6b090fd4 Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d
am: 087d33febf

Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43
2016-07-08 14:52:26 +00:00
Suprabh Shukla
087d33febf Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev
am: 33fa5dfa1d

Change-Id: Ife69e438d83ddfb75433f92c6c5521ae4c3f82cc
2016-07-08 14:44:53 +00:00
TreeHugger Robot
33fa5dfa1d Merge "Making timeouts configurable through Settings" into nyc-mr1-dev 2016-07-08 14:36:34 +00:00
Andrei Stingaceanu
95331038c3 CalendarView Material - throw exception if date is out of range
Similar to CalendarViewLegacyDelegate#goTo

Bug: 28019187
Change-Id: Id21dcd208a594b98dc89caf59d36b32bdf9484be
2016-07-08 15:22:56 +01:00
Kirill Grouchnikov
f0f1d016e3 Merge "One more pass over Javadocs of RemoteViews public APIs" 2016-07-08 14:11:12 +00:00
Andreas Gampe
d281b4204a Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
Breaks monkey in root mode.

This reverts commit 6e16714c68.

Bug: 29338430
Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
2016-07-08 03:50:27 +00:00
Keisuke Kuroyanagi
d79f237d63 Merge "Make Undo/Redo work properly with IME." 2016-07-08 03:34:15 +00:00
Ben Lin
d7d1487ec8 Docsui-level work for implementing Eject on Roots list.
1. Added Eject Icon for Roots that support eject
2. Added Context Menu for RootsFragment (Settings and Eject)

Bug: 29584653
Change-Id: I97f582de05763e3f0327bc0d2dc6d4e2222e047c
(cherry picked from commit d96661f8b0f613b40f2bdfc178bbe06022b5f76c)
2016-07-08 00:03:57 +00:00
Todd Kennedy
ae76412b99 Merge \\"Add values to ApplicationInfoFlags\\" into nyc-mr1-dev am: 6ac6ceb28b
am: 296b9edfb5

Change-Id: Icb86b109bb55500ad8f0f0768a5e8e8b04147bab
2016-07-07 23:31:18 +00:00
Todd Kennedy
296b9edfb5 Merge \"Add values to ApplicationInfoFlags\" into nyc-mr1-dev
am: 6ac6ceb28b

Change-Id: I3aa2488496d7f21440c2bef03944b0f2bdaaa0b3
2016-07-07 23:24:00 +00:00
TreeHugger Robot
6ac6ceb28b Merge "Add values to ApplicationInfoFlags" into nyc-mr1-dev 2016-07-07 23:15:26 +00:00
Todd Kennedy
5a32c6c290 Add values to ApplicationInfoFlags
Need to add MATCH_DISABLED_UNTIL_USED_COMPONENTS [and the deprecated
GET_DISABLED_UNTIL_USED_COMPONENTS] since those are used when building
the ApplicationInfo object.

Bug: 29824931
Change-Id: I09b24427222fed082f0946717826d2e0db857c7a
2016-07-07 14:29:06 -07:00
Makoto Onuki
fd949c63e4 Merge \\"Hide more shortcut APIs\\" into nyc-mr1-dev am: 07e234c9d7
am: 639a862315

Change-Id: I215b00bae0bb6f9f6c44c23a713f69988f9ec9df
2016-07-07 21:16:43 +00:00
Suprabh Shukla
dbbc7af063 Making timeouts configurable through Settings
Adding a global setting for timeouts used in retail demo mode.
Also renaming the protected intent ACTION_RESET_DEMO to reflect proper
owner package.

Bug: 29917613
Change-Id: I9a174503626ab28cceb5024a8e63d27612439b92
2016-07-07 14:12:14 -07:00
Makoto Onuki
639a862315 Merge \"Hide more shortcut APIs\" into nyc-mr1-dev
am: 07e234c9d7

Change-Id: If18c62359352c928e2b36c42563d5223c517964e
2016-07-07 21:10:00 +00:00
Tim Murray
aa1735370b Merge changes from topic \\'fifo\\' into nyc-mr1-dev am: a96d445aef
am: 03b34e402c

Change-Id: If3104889f659aef9a6d7035e18ab839544c9ecb3
2016-07-07 20:59:09 +00:00
Makoto Onuki
07e234c9d7 Merge "Hide more shortcut APIs" into nyc-mr1-dev 2016-07-07 20:52:23 +00:00
Tim Murray
03b34e402c Merge changes from topic \'fifo\' into nyc-mr1-dev
am: a96d445aef

Change-Id: If4a5c3f65cb611aecf82ad49ad6d992f098cbfb1
2016-07-07 20:48:27 +00:00
Jeff Sharkey
fd9c9ee13d Merge \\"Treat everyone the same.\\" into nyc-mr1-dev am: a1b026ea2e
am: f32a5c426f

Change-Id: I5e3c1c5fc2b25fd7a5b8cd61ed9fb073b66240e2
2016-07-07 20:35:36 +00:00
Tim Murray
a96d445aef Merge changes from topic 'fifo' into nyc-mr1-dev
* changes:
  Add new mode for SCHED_FIFO on UI and RenderThreads.
  Add isThreadInProcess.
2016-07-07 20:29:24 +00:00
Jeff Sharkey
f32a5c426f Merge \"Treat everyone the same.\" into nyc-mr1-dev
am: a1b026ea2e

Change-Id: I853c743364189e689e29d87ab6c53b7963ebae2f
2016-07-07 20:27:55 +00:00
TreeHugger Robot
a1b026ea2e Merge "Treat everyone the same." into nyc-mr1-dev 2016-07-07 20:20:01 +00:00
Tim Murray
33eb07f575 Add new mode for SCHED_FIFO on UI and RenderThreads.
Add a new mode, controlled by sys.use_fifo_ui property, that enables the
top app's UI and RenderThread to be SCHED_FIFO. This eliminates almost
all jank due to scheduling competition with non-UI critical
threads. This mode may not be suitable for all devices.

bug 24503801

Change-Id: I7b8a31830ad80f7efa00236928d5476998ed4e00
2016-07-07 12:55:31 -07:00
Makoto Onuki
f805b43da7 Hide more shortcut APIs
Change-Id: I911b4963b878e67ad2084190ac080e8555ba63c0
2016-07-07 11:56:04 -07:00
Philip P. Moltmann
e8fde0f9cd Merge "Fix doc for default print document content type" 2016-07-07 17:04:57 +00:00
Dave Langemak
c48903b7e9 Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f93012
am: d34da3b659

Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da
2016-07-07 15:56:10 +00:00
Makoto Onuki
d34da3b659 Merge \"Hide APIs that shouldn\'t have been public\" into nyc-mr1-dev
am: 8317f93012

Change-Id: I28a43a5391d8f815029a3f78ef2f45bc67105bb9
2016-07-07 15:47:43 +00:00
Dave Langemak
8317f93012 Merge "Hide APIs that shouldn't have been public" into nyc-mr1-dev 2016-07-07 15:38:12 +00:00
Andrei Stingaceanu
f87b0e1215 TimePicker - introduce hidden methods for CTS testing
For assisting the TimePickerTest keyboard traversal and
keyboard entries CTS tests.

Bug: 26187903
Change-Id: Ie30a006d07b7e5f75b11645e84c5df8b470cb52b
2016-07-07 15:05:57 +00:00
Hugo Benichi
219d9ba4fa Merge \\"IpConn metrics: distinguish NUD_FAILED answers\\" into nyc-mr1-dev am: 42e608527a
am: 99b36c8b4f

Change-Id: Iade155a1941674edf642e99bd506d1676b67ab42
2016-07-07 13:17:27 +00:00
Hugo Benichi
99b36c8b4f Merge \"IpConn metrics: distinguish NUD_FAILED answers\" into nyc-mr1-dev
am: 42e608527a

Change-Id: I4303badea7760c6cd9a1b63db1df8a3766a638f2
2016-07-07 13:11:01 +00:00
Hugo Benichi
42e608527a Merge "IpConn metrics: distinguish NUD_FAILED answers" into nyc-mr1-dev 2016-07-07 13:02:31 +00:00
Hugo Benichi
a2332e55c5 Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: 78feae882a
am: a965203d5f

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
2016-07-07 09:45:36 +00:00
Hugo Benichi
a965203d5f Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev
am: 78feae882a

Change-Id: Ib7b10c59c1f7c84ec78c7527fba8a6c9aa5b0c05
2016-07-07 09:38:29 +00:00
TreeHugger Robot
78feae882a Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev 2016-07-07 09:33:35 +00:00
Hugo Benichi
c31e68eadf Merge \\"IpConn metrics: add times to DHCP bound state\\" into nyc-mr1-dev am: bbf97cd121
am: af71487dd7

Change-Id: Icecc32a3c9d220f64dc807008354bb0678cf5564
2016-07-07 09:18:59 +00:00
Hugo Benichi
af71487dd7 Merge \"IpConn metrics: add times to DHCP bound state\" into nyc-mr1-dev
am: bbf97cd121

Change-Id: I0002c00d03165ac4bfa4a9790984d9e5615d7ff4
2016-07-07 09:13:22 +00:00
TreeHugger Robot
bbf97cd121 Merge "IpConn metrics: add times to DHCP bound state" into nyc-mr1-dev 2016-07-07 09:06:46 +00:00
Hugo Benichi
7643423521 IpConn metrics: add times to DHCP bound state
This patch adds DhcpClientEvent logging for:
 - time from init state to bound state
 - time from bound state to bound state when renewing

Example:
ConnectivityMetricsEvent(12:04:33.353, 0, 0): DhcpClientEvent(wlan0, WaitBeforeStartState, 94ms)
ConnectivityMetricsEvent(12:04:35.772, 0, 0): DhcpClientEvent(wlan0, DhcpInitState, 2417ms)
ConnectivityMetricsEvent(12:04:35.787, 0, 0): DhcpClientEvent(wlan0, DhcpRequestingState, 15ms)
ConnectivityMetricsEvent(12:04:35.793, 0, 0): DhcpClientEvent(wlan0, ConfiguringInterfaceState, 6ms)
ConnectivityMetricsEvent(12:04:35.811, 0, 0): DhcpClientEvent(wlan0, InitialBoundState, 2457ms)
ConnectivityMetricsEvent(12:05:35.791, 0, 0): DhcpClientEvent(wlan0, DhcpBoundState, 59998ms)
ConnectivityMetricsEvent(12:05:35.988, 0, 0): DhcpClientEvent(wlan0, WaitBeforeRenewalState, 196ms)
ConnectivityMetricsEvent(12:05:36.003, 0, 0): DhcpClientEvent(wlan0, DhcpRenewingState, 15ms)
ConnectivityMetricsEvent(12:05:36.010, 0, 0): DhcpClientEvent(wlan0, RenewingBoundState, 219ms)

Change-Id: I2540dd102a6509dff55936e38015265659b20760
2016-07-07 16:10:20 +09:00
Hugo Benichi
0d1c65b221 IpConn metrics: distinguish NUD_FAILED answers
This patch adds in IpReachabilityMonitor a timestamp variable set
everytime that probeAll() send NUD probe requests to RTNETLINK.
This allows to distinguish between:
  1) NUD_FAILED events resulting from such a forced NUD probe
  2) "organic" NUD_FAILED notifications from the kernel

This distinction is added to IpReachabilityEvent as a one-bit flag.

This patch also changes the formatting of ApfProgramEvent flags to use
'|' as a joining character, similarly to other flags formatting.

Bug: 21859053
Change-Id: I24c64a3f17fa283eace5bd0a05c21a90a2305359
2016-07-07 15:58:28 +09:00
Svet Ganov
f1d788adee Merge \"Merge \\"Merge \\\"Use proper lock when accessing the generation registry\\\" into nyc-dev am: dcf2e205bf\\" into nyc-mr1-dev am: d0302f579b\" into nyc-mr1-dev-plus-aosp
am: f910dab5f7

Change-Id: I86bda42056b6af37febccf48ebe09ee6363b50d0
2016-07-07 01:47:45 +00:00
Jeff Sharkey
2e2c64556c Merge \"Merge \\"Switch network cycle calculation to use Calendar.\\" into nyc-mr1-dev am: 3a4408640a\" into nyc-mr1-dev-plus-aosp
am: 54a704bfcd

Change-Id: I2924d4f96cf0ab52131570a270091d0d9480af0f
2016-07-07 01:47:39 +00:00
Svet Ganov
eabaf266f8 Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev
am: d0302f579b

Change-Id: I8cd55faa5e8c788752ae411f29f29d9261f327c0
2016-07-07 01:31:55 +00:00
Jeff Sharkey
6d8cffc4e9 Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev
am: 3a4408640a

Change-Id: Icd8026e94b3d67523858486844f2195fc18f107b
2016-07-07 01:31:46 +00:00