222378 Commits

Author SHA1 Message Date
Sanket Padawe
abea6dc466 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev 2015-11-17 01:07:28 +00:00
Daichi Hirono
0fe13b1f70 Merge "Add a mehtod definition to StorageManager for appfuse." 2015-11-17 01:05:20 +00:00
Dianne Hackborn
1653ac4395 Merge "Don't send PACKAGE_CHANGED of components to manifest receivers." 2015-11-17 00:41:35 +00:00
Dianne Hackborn
354c3bc394 Merge "Some debugging improvements." 2015-11-17 00:41:07 +00:00
Dianne Hackborn
627dfa1dda Be smarter about determining when we can stop idle maintenance.
The device idle service now knows when the system is actively
doing significant things (syncs, jobs, alarms, downloads).  It
uses this, when in an idle maintenance window, to determine when
it can end that window early -- when such work is no longer
happening.

For now this just allows us to shorten the windows.  In the future
we should use this to allow us to expand the windows to a longer
potential time, adjusting future windows to shorter durations if
earlier ones use more time.  This will allow us to batch occasional
long operations (such as downloads) into one window, making up
for that with much shorter later windows.

Change-Id: Ie482abd50bc43be9a8917a769a5175851eee4ec4
2015-11-16 16:38:29 -08:00
Michael Kwan
03f62d7af2 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours
am: 2c8f3734af  -s ours

* commit '2c8f3734afd5f104166bfb045794970414eb5052':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
2015-11-17 00:14:34 +00:00
Michael Kwan
2c8f3734af DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours
am: b0aae584ea  -s ours

* commit 'b0aae584ea2a5649ac113ba05c88cbbe6616709e':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
2015-11-17 00:06:28 +00:00
Adam Lesinski
f20bfb6776 Merge "AAPT2: Prevent duplicate enums/flags" 2015-11-17 00:00:48 +00:00
Adam Lesinski
abf83cbe4f AAPT2: Prevent duplicate enums/flags
Change-Id: I998cba12ac194000e9c778cb620ed7ab33003e7d
2015-11-16 15:59:10 -08:00
Michael Kwan
6881185307 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours
am: f23229f45f  -s ours

* commit 'f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
2015-11-16 23:57:50 +00:00
Michael Kwan
b0aae584ea DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours
am: f23229f45f  -s ours

* commit 'f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
2015-11-16 23:57:47 +00:00
Michael Kwan
f23229f45f DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
am: 8d6630b87c  -s ours

* commit '8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
2015-11-16 23:48:39 +00:00
Deepanshu Gupta
2b0551175d WindowDecorActionBar name change fix.
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.

Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
2015-11-16 15:46:12 -08:00
Wale Ogunwale
5e7fda2ea1 Merge "Crop window input region to stack bounds." 2015-11-16 23:45:13 +00:00
Adam Lesinski
33461a0c32 Merge "AAPT2: Fix tokenizer to deal with the separator as last char" 2015-11-16 23:44:49 +00:00
Adam Lesinski
cf95a58014 AAPT2: Fix tokenizer to deal with the separator as last char
When the separator was the last character, the tokenizer would skip
the empty string, which is wrong.

Change-Id: I64ceb4e8d4ac48ee41d40781ab5785a3bc61b24d
2015-11-16 15:44:08 -08:00
Daichi Hirono
9e8d9e250b Add a mehtod definition to StorageManager for appfuse.
BUG=25091416

Change-Id: Id4d4a000daf89fab4917528fcd0d1270547fbfa4
2015-11-17 08:44:06 +09:00
Adam Lesinski
196c8e7013 Merge "AAPT2: Fix a bug where files would only show up for one config" 2015-11-16 23:41:25 +00:00
Jeffrey Vander Stoep
cb60f71c71 Merge "fix ApplicationInfo flag collision" 2015-11-16 23:33:53 +00:00
Daichi Hirono
4604b74603 Prepare for adding MtpDocumentsProvider tests to APCT.
BUG=25093356

Change-Id: I0c194e6bf3abeb632171e9be49471b9d94a0cb4c
2015-11-17 08:30:41 +09:00
Jeff Vander Stoep
9edb7bf4c6 fix ApplicationInfo flag collision
Give PRIVATE_FLAG_AUTOPLAY unique value

Bug: 25726468
Change-Id: I1dabe26eb4c72004ebd7e33252240e10c15c9159
2015-11-16 15:23:38 -08:00
Wale Ogunwale
484d009cf6 Merge "Set-up dummy animation when setting a replacing window token" 2015-11-16 23:16:07 +00:00
Mitchell Wills
2564d9a4ef Expose gscan exponential backoff API
Will be ignored until scan scheduling supports it

Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
2015-11-16 15:10:44 -08:00
Adam Lesinski
fc9570e6b0 AAPT2: Fix a bug where files would only show up for one config
The set of files to build was only comparing resource name and
not configuration.

Also support --extra-packages as a colon separated list of packages.

Change-Id: I36b65cd15299cdc722b785a7891a24ca1bc4fb45
2015-11-16 15:09:15 -08:00
Chris Craik
b20dbf6c6a Merge "Finish shadow support in new reorderer/renderer" 2015-11-16 23:08:48 +00:00
Wale Ogunwale
053c8e4ef4 Crop window input region to stack bounds.
Prevents the input region of a window from extending outside
the stack bounds. For example, if you have a non-sizeable
activity in docked mode you don't want the app getting touchs
when you tap on the side occupied by the other app.

Bug: 25710884
Change-Id: I044b4e87448fbd3eb51822e6d71e8ed8d06f55ec
2015-11-16 14:27:21 -08:00
Alan Viverette
1ca1860f97 Merge "Clean up PopupMenu" 2015-11-16 22:24:29 +00:00
Alan Viverette
1a6436c9ea Merge "Clean up TimePicker" 2015-11-16 22:24:12 +00:00
Michael Kwan
8d6630b87c DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.

The hack stops this behaviour, and also sets MTP mode back to none.

Bug: 25547826
Bug: 25582050
Bug: 25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
2015-11-16 14:05:29 -08:00
Alan Viverette
7323810898 Clean up PopupMenu
No functional changes, only refactoring:
- remove unused mShowCascadingMenus member variable
- move private interface implementations to anonymous inner classes
- move interfaces to end of class
- clean up docs formatting

Change-Id: Ib82ca0d3a3ff49207959a17b77c4ff4f11a1afc2
2015-11-16 16:55:58 -05:00
Philip P. Moltmann
354bd63726 Merge "Show "select a printer" as "destination" the first the the user prints" 2015-11-16 21:43:22 +00:00
Rom Lemarchand
152d353e87 Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
am: 5032e49f9e

* commit '5032e49f9e8ec8307dbc265a78649c2b49e4e5ad':
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.
2015-11-16 21:43:06 +00:00
Alan Viverette
3b7e2b9102 Update the TimePicker hour format when toggling 24-hour mode
Bug: 25615007
Change-Id: I47a9f6b07e0cf7c86ca6d25c835a06878878d483
2015-11-16 16:38:38 -05:00
Adam Lesinski
2c23271c75 Merge "AAPT2: Be more strict parsing references" 2015-11-16 21:36:54 +00:00
Adam Lesinski
dcdf08ff4c Merge "AAPT2: Minor fixes to SymbolTable and diagnostic output" 2015-11-16 21:36:14 +00:00
Rom Lemarchand
5032e49f9e Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.
2015-11-16 21:33:48 +00:00
Alan Viverette
4420ae875d Clean up TimePicker
No functional changes, only refactoring:
- shorten method and variable names
- remove unused validation callback
- avoid using return in setters

Change-Id: Ie7c19cfe3c5cb515695f943c534899d37ad032bb
2015-11-16 16:10:56 -05:00
Wale Ogunwale
3cd48043a3 Set-up dummy animation when setting a replacing window token
Set-up dummy animation so we can start treating windows associated
with the replacing app token like they are in transition before the
new app window is ready for us to run the real transition animation.
This allows us to make the right decisions at various call points
where an animation is expected to be running for a replacing window
but the real animation isn't set yet.

Also, removed unused field indicating if an app token is animating
a replacement window since it was always set to true and checked/set
to the same value as AppWindowToken.mWillReplaceWindow.

Bug: 25645069
Change-Id: Ie216ed5bd60fb2a15da61c7050c9344c48b1c5fb
2015-11-16 13:09:29 -08:00
Eino-Ville Talvala
07437cbc9c Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 am: 579cc90e61
am: e1cbe99e5f

* commit 'e1cbe99e5ff222f5d017af83466793209e668ed7':
  Camera: Minor documentation update
2015-11-16 20:59:58 +00:00
Fyodor Kupolov
11c5b0aff7 Merge "Reduce excessive locking in UserManager" 2015-11-16 20:52:05 +00:00
Eino-Ville Talvala
e1cbe99e5f Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0
am: 579cc90e61

* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':
  Camera: Minor documentation update
2015-11-16 20:51:32 +00:00
Chad Brubaker
fd0d31a3f4 Add NetworkSecurityConfigProvider.install
This method is not currently called.

Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
2015-11-16 12:49:36 -08:00
Eino-Ville Talvala
579cc90e61 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9
am: c24b39e0c0

* commit 'c24b39e0c0f760ac6a53d4fbbf1ed1885fd64529':
  Camera: Minor documentation update
2015-11-16 20:44:44 +00:00
Alan Viverette
c45b1d4ae4 Use correct rounding in View for potentially negative values
Fast rounding doesn't work for negative values, so use Math.round()
where we might encounter negative values. Use Math.floor() and ceil()
for rounding down and up, respectively.

Bug: 25695621
Change-Id: I94831b8eb7552fc24cbe5808e923de1674d8ba6d
2015-11-16 15:38:59 -05:00
John Reck
f286822aad Merge "Extensions must load in ctor" 2015-11-16 20:36:01 +00:00
Eino-Ville Talvala
f5b98ee1dc Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
2015-11-16 20:35:51 +00:00
Eino-Ville Talvala
c24b39e0c0 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
2015-11-16 20:35:48 +00:00
Adam Lesinski
7298bc9c85 AAPT2: Be more strict parsing references
Change-Id: I3d54a519687fff1e66acb8e395ef99ba01a1b845
2015-11-16 12:31:52 -08:00
Alex Klyubin
00245ffce4 Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.
2015-11-16 20:31:36 +00:00
Eino-Ville Talvala
784f0f15a9 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759
am: 062c629e5c

* commit '062c629e5c6270da232bbd2800966ab5dc6c615f':
  Camera: Minor documentation update
2015-11-16 20:27:03 +00:00