Commit Graph

246497 Commits

Author SHA1 Message Date
Adam Lesinski
7c7ee79dc9 Merge "Record in progress count when parceling Timer" into nyc-dev
am: 752434a

* commit '752434a0ff54ac30b7701292b66361e64b2ae5a0':
  Record in progress count when parceling Timer

Change-Id: Ia54421b870e7b1519d607ac841fd1470964aab2a
2016-04-20 01:31:08 +00:00
Adam Lesinski
9acfd8166b BatteryStats: use the same timestamp for comparing intervals
Use the timestamp provided by the modem to compare time.

Bug:28133571
Change-Id: I046bc1f2b90ba9b8b8245f031925476680ba5275
2016-04-19 18:29:50 -07:00
TreeHugger Robot
75db0392b8 Merge "Fix NPE in WallpaperDrawable" into nyc-dev 2016-04-20 01:27:35 +00:00
Adam Lesinski
d6a369313b Merge "Move batterystats stats collection to its own thread" into nyc-dev
am: b7a92e6

* commit 'b7a92e6009fefc2cb390b886e6a971b0c8a3c2d8':
  Move batterystats stats collection to its own thread

Change-Id: If1fa33f99f21811b52185926d6d81ccde30e9648
2016-04-20 01:23:38 +00:00
Adam Lesinski
752434a0ff Merge "Record in progress count when parceling Timer" into nyc-dev 2016-04-20 01:22:37 +00:00
Adam Lesinski
b7a92e6009 Merge "Move batterystats stats collection to its own thread" into nyc-dev 2016-04-20 01:18:49 +00:00
Chris Craik
f3754a8428 Fix shadow radius too large for RS
bug:28276925

Change-Id: I3d962ace75be7bbf49f5a95320390d8f5a9bf951
2016-04-19 18:15:51 -07:00
Kevin Hufnagle
19db30bc49 Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs
am: 190bf3b943

* commit '190bf3b943597e28a6d42da88b417c57073bad43':
  docs: Improved description of "package" attribute (manifest).

Change-Id: Id53521c27eab140e57ccba079cffcfa069852296
2016-04-20 00:56:18 +00:00
Kevin Hufnagle
c9c3ad8c5e Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs
am: c3500321cd

* commit 'c3500321cd10300b5dd44330e704fec55d62bce6':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: I8d7ed288d4265b28372f09c17ad48d06c2a904c7
2016-04-20 00:56:17 +00:00
destradaa
78cebca720 Add support for multiple callback registration in.
- Allows several callbacks from different processes to register with
  the ContextHub service.
- Add an 'internal' callback that can be used for primary clients.
- Fix issue with parceling NanoApp info

Change-Id: Iec203e8b8bc847cb9274f3f4157d0773984dd87c
2016-04-19 17:45:18 -07:00
Kevin Hufnagle
190bf3b943 Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs 2016-04-20 00:43:46 +00:00
Kevin Hufnagle
c3500321cd Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs 2016-04-20 00:42:48 +00:00
Adrian Roos
18cb744cb7 Merge "Disable anti-falsing logic with touch exploration" into nyc-dev
am: ecdc5c4448

* commit 'ecdc5c44488cef2f1599b3759277c219cfd28da3':
  Disable anti-falsing logic with touch exploration

Change-Id: I28a04dfa863019a31398a18f9873bb81172bbbed
2016-04-20 00:41:34 +00:00
Adrian Roos
ecdc5c4448 Merge "Disable anti-falsing logic with touch exploration" into nyc-dev 2016-04-20 00:38:06 +00:00
Adam Lesinski
20b84dfa59 Move batterystats stats collection to its own thread
Too many other tasks run on common handlers, and the batterystats collection
may block waiting for a timeout of up to 2 seconds.

Bug:27857665
Change-Id: I5be1ddc374d69620f4f7d821eb29e8524294c9a4
2016-04-19 17:33:33 -07:00
Adrian Roos
6a70b884df Don't do anti-falsing on locked shade
The user has already passed the keyguard test by
dragging down. We're not doing anti falsing at this
point and doing it on the affordance was triggering
a crash on debuggable builds (and not working at all
on regular builds).

Change-Id: Icaf81e8e2a38503851c7b5699a0f5a3d363dac19
Fixes: 28154836
2016-04-20 00:32:21 +00:00
Sudheer Shanka
8f182f1454 Fix additional summary of RestrictedSwitchPreference.
Bug: 27659072
Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490
2016-04-19 17:27:52 -07:00
Winson
cb6674ef06 Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev
am: 5d65340fc5

* commit '5d65340fc5b5a0becd204b3feb9627b2de33fceb':
  Fixing crash when dumping secondary SystemUI user service.

Change-Id: I6fc0594335291a07e7dae79cc8c80b0b3d952acc
2016-04-20 00:26:26 +00:00
Adam Lesinski
98f0d4692c Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.

Bug:27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
2016-04-19 17:21:40 -07:00
Winson Chung
5d65340fc5 Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev 2016-04-20 00:21:39 +00:00
Amith Yamasani
37f9de996e Reinitialize voice interaction service on unlock
Fixes the incomplete initialization on FBE devices when
voice interaction service is not available before unlock.

Change-Id: I397237e4554453d29da643aee59384e289fa3654
Fixes: 28183380
2016-04-19 17:20:51 -07:00
fionaxu
6ee7417cd7 Merge "Cold Sim issue fix" into nyc-dev
am: 771fbfef27

* commit '771fbfef27bcc98c57818b7c7b63a374e555b6db':
  Cold Sim issue fix

Change-Id: I266ed3e12d9aebaa06d7fc666465eea6a59fc940
2016-04-20 00:14:33 +00:00
Jorim Jaggi
47606dc20f Merge "Fixes for resize thread" into nyc-dev
am: 13219992a0

* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
  Fixes for resize thread

Change-Id: If7fd07fb9711516726a192fa056d54a76d197062
2016-04-20 00:14:29 +00:00
Chen Xu
771fbfef27 Merge "Cold Sim issue fix" into nyc-dev 2016-04-20 00:10:01 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Phil Weaver
13ce4693d3 Clear calling identity when binding a11y services
When a UiAutomation is destroyed, accessibility services may get
enabled as a side effect. That was causing these services to be
enabled in a binder thread, which threw a SecurityException.

Bug: 28268310
Bug: 28163652
Change-Id: Ie25ab05569b5b21b5f30e7d7eed24ef73b7ba159
2016-04-19 17:07:20 -07:00
Jorim Jaggi
db21bbd2ca Fix wrong transition when recents is growing when entering
Bug: 27855229
Change-Id: I050305d16df6fe53abf5e74e1f9ee6c882dd7ead
2016-04-19 17:07:06 -07:00
Christopher Tate
5e380f096c resolve merge conflicts of 7641889 to lmp-mr1-dev
am: cebcde3b5a

* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
2016-04-20 00:05:54 +00:00
Trevor Johns
483abe2d8b Remove links to createAndInitializeUser() and createUser()
These methods in DevicePolicyManager have been removed from the
public API in NYC.

Converting @link tags to @code to avoid error during JavaDoc gen.

Change-Id: I5d481ccf65bcf83a61f43cfac8ae474656ff34c1
2016-04-19 17:01:12 -07:00
Pavel Zhamaitsiak
6e6950ee66 Add addRegistrationListener function to IImsService.aidl
This allows to register additional IMS connection listeners.
IImsService.open() is no longer supposed to be used for that purpose.

Bug: 28150730
Change-Id: I949e0c912de66e82864934a1ad9ec2ec36f57909
2016-04-19 23:49:55 +00:00
Adrian Roos
751f33f8c7 Fix NPE in WallpaperDrawable
Fixes: 28272898
Change-Id: I0377a341c253c79f5179b3a9c8eadcf51f9ffad3
2016-04-19 16:41:36 -07:00
Jeff Sharkey
6f97467470 Merge "Don\'t block while dispatching PRE_BOOT." into nyc-dev
am: e23f581081

* commit 'e23f581081b834d6928a4e8924432e0109391387':
  Don't block while dispatching PRE_BOOT.

Change-Id: I4ed9ae94721ce2b970001f4352fa2c5f2b10f0b7
2016-04-19 23:28:56 +00:00
TreeHugger Robot
e23f581081 Merge "Don't block while dispatching PRE_BOOT." into nyc-dev 2016-04-19 23:23:49 +00:00
Winson
5b15f9bb9d Fixing crash when dumping secondary SystemUI user service.
- Secondary user’s SystemUI process is initialized with 
  SERVICES_PER_USER, which is a strict subset of SERVICES, but mServices
  is a fixed size array that does not change, so we need to add a null
  check when iterating through the current list of services for the 
  non-primary user.

Bug: 28153575
Change-Id: I0a6b4726e82f2efddda358a835b1ef3d9f165375
2016-04-19 16:18:28 -07:00
Tyler Gunn
ee61c6232e Add new carrier config option for video conference support.
- Default to off.
- @hide for now until we know whether we can bump the API rev for the DR.

Bug: 27658118
Change-Id: Ie0eda180f0a50b8f7026fce9eac8903f9a82eef5
2016-04-19 16:17:19 -07:00
Winson
e5c29212ee Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
am: b77d0bcc84

* commit 'b77d0bcc840fbda8372c4042a1f2e83df8e12a83':
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.

Change-Id: I13581c13e765bb4fee14a1f0f20acc1498666f43
2016-04-19 23:09:17 +00:00
Adarsh Fernando
86efe4331c Merge "Docs: Background optimizations \'foreground\' -> \'running app\' fix." into mnc-mr-docs
am: df0509bce1

* commit 'df0509bce10ebe1cdf9515c09f2f423f3db961c8':
  Docs: Background optimizations 'foreground' -> 'running app' fix.

Change-Id: Icfa302cddba697897be8737fb4bcb5113803123a
2016-04-19 23:04:58 +00:00
Winson Chung
b77d0bcc84 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
* changes:
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.
2016-04-19 23:01:20 +00:00
Adarsh Fernando
df0509bce1 Merge "Docs: Background optimizations 'foreground' -> 'running app' fix." into mnc-mr-docs 2016-04-19 22:55:14 +00:00
Christopher Tate
cebcde3b5a resolve merge conflicts of 7641889 to lmp-mr1-dev
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
2016-04-19 15:51:37 -07:00
Felipe Leme
fe7549413c Merge "Show "Android System" instead of "Shell" on notifications." into nyc-dev
am: 28baa37

* commit '28baa37a5676297b7972cfd90a07fff5f54cf19b':
  Show "Android System" instead of "Shell" on notifications.

Change-Id: Ief5b48ca7d34038c2f0cd90e09890f482f1e0a34
2016-04-19 22:45:03 +00:00
TreeHugger Robot
28baa37a56 Merge "Show "Android System" instead of "Shell" on notifications." into nyc-dev 2016-04-19 22:34:54 +00:00
Selim Cinek
b699fb0940 Merge changes Id1278b07,Ic3da5046 into nyc-dev
am: e45ed15

* commit 'e45ed15388c48b0b39274d1038dafbdbc06fb2b3':
  Fixed a bug where expanding by touch wasn't possible
  Made sure the fake shadow won't be invisible

Change-Id: I0d745797554b733d1be8b48137d0b76cb8001a0b
2016-04-19 22:31:48 +00:00
Kevin Hufnagle
37d1814ed7 docs: Clarified purpose of application "name" attr within manifest.
Improved descriptions of the "name" attribute of the <application>
element, which appears within an Android app's <manifest> element in
its manifest file. Also clarified connection between this attribute
and custom subclasses of the Application class.

Bug: 1232595
Change-Id: I79b6bd31224c7669b5dc509914a01ead84a049dc
Abandoned-Change-Id: Icee66f6b8df55c7fad414b4c19939a483dc7a165
2016-04-19 15:26:18 -07:00
Doris Liu
6690504457 Merge "Fix pause/resume for AnimatorSet" into nyc-dev
am: dd67b0d

* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
  Fix pause/resume for AnimatorSet

Change-Id: Ia723c49840910cb45d4cb5f03963d86cca53e896
2016-04-19 22:24:22 +00:00
Doris Liu
10cfe40280 Merge "Pause infinite AVD when the drawable is not visible" into nyc-dev
am: 967d934

* commit '967d93440cd1386810bdfad50dcca4bff9bae722':
  Pause infinite AVD when the drawable is not visible

Change-Id: I7278aed75a1b96b747a755d3869cd7f8be6af02e
2016-04-19 22:24:21 +00:00
TreeHugger Robot
e45ed15388 Merge changes Id1278b07,Ic3da5046 into nyc-dev
* changes:
  Fixed a bug where expanding by touch wasn't possible
  Made sure the fake shadow won't be invisible
2016-04-19 22:23:32 +00:00
Selim Cinek
fe090658b6 Fixed a bug where expanding by touch wasn't possible
In landscape expanding by touch was not working because
the rawX is different from the X.

Change-Id: Id1278b073ea2e10258648884c528f5db273f2d78
Fixes: 27923197
2016-04-19 15:19:04 -07:00
Selim Cinek
e4367d60fc Made sure the fake shadow won't be invisible
The shadow could still be invisible as it was too
small.

Change-Id: Ic3da504663a449e60f490af14bb98701cff2653c
Fixes: 27317665
2016-04-19 15:19:00 -07:00
Robert Carr
e9e87a8022 Merge "Force windows to be scalable during pinned animation." into nyc-dev
am: 4e9a9df

* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
  Force windows to be scalable during pinned animation.

Change-Id: I0b5ccf45dd68ccbe8fe6ab2acd8280a4bc47b060
2016-04-19 22:17:12 +00:00