Commit Graph

253881 Commits

Author SHA1 Message Date
TreeHugger Robot
8c16969c3e Merge "Changing default value of config_use_sim_language_file to false." into nyc-mr1-dev 2016-08-24 22:03:13 +00:00
Svetoslav Ganov
d9bc0f474c Merge "Use correct UID checks and proper database lookup" into nyc-mr1-dev 2016-08-24 21:57:17 +00:00
Svetoslav Ganov
7ee37f48dc Use correct UID checks and proper database lookup
bug:31056110
bug:31050549
bug:28163381

Change-Id: I726645ae0d2456a5b4d38005fe78523332758842
2016-08-24 14:53:18 -07:00
Makoto Onuki
0a15cd4ba0 Backport shortcut manager test utilities to DR
Bug 29612099
Bug 31033599

Change-Id: I59d4ae61fdb2245797f2d8e39beddc3b66b93fe6
2016-08-24 14:38:23 -07:00
Geoffrey Pitsch
b2d6ed3cd1 Prevent notifyScreenshotError() from calling twice
Found this while investigating the attached bug.
Fixes potential race condition between onServiceDisconnected and
mScreenshotTimeout both calling notifyScreenshotError.

If onServiceDisconnected is going to show an error to the user, I think
it should also unbind, as we would expect the user to re-take the shot
at that point.  Ideally, this would replace the timeout handler entirely.

Not exactly sure how to test this - I tried crashing the
TakeScreenshotService locally, but onServiceDisconnected didn't trigger.

Bug: 28982719
Change-Id: I5093c61735b0661f9874c686e197cd894c3ef7ae
2016-08-24 17:20:36 -04:00
Geoffrey Pitsch
db90897b5f Support multichannel sounds in bootanim
Manually handle the 1-2 channel cases to avoid the warning
log when 0 is passed as the channelMask.

Bug: 30820152
Change-Id: I4d2c8736ff442fae9a4c5eb16061646fb53151b6
2016-08-24 16:59:16 -04:00
Makoto Onuki
fc4cf2da34 Shortcut: Improve backup & restore
* Catch RuntimeException from restore, in case restoring from a
partner device with an incompatible file format.

* When a restore target app is already installed, and
- if it has allowBackup=true, we'll restore normally, so all
existing shortcuts will be replaced. (but manifest shortcuts
will be re-published anyway.) We log a warning on logcat.

- if it has allowBackup=false, we don't touch any of the
existing shortcuts.

Bug 31057974
Bug 30766177

Change-Id: Ic3f7e860e7ea0d086fc589d8cbed8c4cebdd4bc6
2016-08-24 13:52:02 -07:00
David Christie
6195acc2b5 resolve merge conflicts of a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Adrian Roos
190e532c86 DirectReply: Fix bugs when replying from HUNs
Fixes a bug that would re-open the remote input when
it was sent while HUN'd. Also fixes a bug that would
not properly clear a notification if swiped away and
at the same time HUN'd and having a reply active.

Change-Id: I3e8b5f81eaffd8e4b8602f3dbdd025229ba201fa
Fixes: 30454772
2016-08-24 20:41:19 +00:00
Sudheer Shanka
cdf70ba0a3 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944
am: a0994c6d58

Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0
2016-08-24 20:38:40 +00:00
Sudheer Shanka
dfc2d0a4bc Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06
am: f21534a288

Change-Id: I4e5a6b4eb30dde276a1293e986398a8dba21ef05
2016-08-24 20:38:30 +00:00
Amith Yamasani
7b8140652b DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986
am: 03b0f5c3ec

Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3
2016-08-24 20:38:20 +00:00
Sudheer Shanka
26bb7bf86c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
am: c8aedeeaf6

Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a
2016-08-24 20:38:16 +00:00
Amith Yamasani
117a383099 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf
am: dd0be992c0

Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
2016-08-24 20:38:12 +00:00
Adrian Roos
9550f2e75c DirectReply: Fix bugs when replying from HUNs
Fixes a bug that would re-open the remote input when
it was sent while HUN'd. Also fixes a bug that would
not properly clear a notification if swiped away and
at the same time HUN'd and having a reply active.

Change-Id: I3e8b5f81eaffd8e4b8602f3dbdd025229ba201fa
Fixes: 30454772
2016-08-24 13:35:15 -07:00
Narayan Kamath
5191225400 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
am: 4d7740907e

Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
2016-08-24 20:30:21 +00:00
Narayan Kamath
c11e8fcc04 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
am: c6c7ca0cde

Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
am: 3c63bb367f

Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30
am: 8788a2413c

Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
2016-08-24 20:30:06 +00:00
David Christie
975879a18d resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
am: 41a0dd41f1

Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
2016-08-24 20:30:01 +00:00
Jack Yu
edaaef304a Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev 2016-08-24 20:24:42 +00:00
TreeHugger Robot
850912db88 Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev 2016-08-24 19:49:36 +00:00
Guang Zhu
d8ac1dd3ed use threadtime when collecting logcat
Bug: 31048686
Test: make droid

Change-Id: I55cd38b9cdc4224fcd319af706d421cdac062f83
2016-08-24 18:52:37 +00:00
Amit Mahajan
2b2f728f28 Changing default value of config_use_sim_language_file to false.
Bug: 30150341
Change-Id: If0183ce0bfa4f872d991e5aed562eeb948ed86c8
2016-08-24 11:45:35 -07:00
Salvador Martinez
e8e7f1b88a Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958
am: e9c519e049

Change-Id: Ie99c9e7d6747866efb03484dbbeec89d4dc6d74b
2016-08-24 18:32:11 +00:00
Salvador Martinez
cfa4ad4e1e Added error handling to settings suggestions list am: 18bf581c77
am: 2cb851e5c9

Change-Id: I5f28a0c854597a576791be97fd1ab0c87183d65d
2016-08-24 18:32:09 +00:00
Salvador Martinez
e9c519e049 Merge "Added error handling to settings suggestions list" into nyc-dev
am: ed004e2958

Change-Id: I674216ef4471444c86b202896b8ce055c54eb584
2016-08-24 18:28:00 +00:00
Salvador Martinez
2cb851e5c9 Added error handling to settings suggestions list
am: 18bf581c77

Change-Id: Id946b2b75b9adc4c70fa4537da4ac509a6ab5c66
2016-08-24 18:27:56 +00:00
Salvador Martinez
ed004e2958 Merge "Added error handling to settings suggestions list" into nyc-dev 2016-08-24 18:17:40 +00:00
Alan Viverette
709f0f3e15 Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
20109a689d Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
16b8941dba Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
4e32b47c48 Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
52306705c1 Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Andrew Rossignol
c35104535c ContextHub: Avoid reference leaks
The ContextHub HAL was leaking references in passOnOsResponse. An
example of this is when a sensor hub reset occurs. If many of these
resets happen, the local reference pool is exhausted and a crash
in the HAL occurs.

Bug: 30706325
Change-Id: Ica5328137a7033f512d7fb1ccf6fa138eab55091
(cherry picked from commit 52dda59896)
2016-08-24 18:15:38 +00:00
Chen Xu
d90b69ffb1 Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev 2016-08-24 18:08:22 +00:00
Doris Ling
d5f9642488 Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev 2016-08-24 18:01:28 +00:00
Alan Viverette
6c1e7451b3 Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f77f
am: f9489216eb

Change-Id: If2389e3de3f5b511ed0ac7cee1025ec2d31cbabc
2016-08-24 17:43:45 +00:00
Alan Viverette
992ef58a33 Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa
am: 70ccc698ec

Change-Id: Ia85253ba6ce6bece037717b7d87955dcac4e9f81
2016-08-24 17:43:43 +00:00
Alan Viverette
f9489216eb Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am: 462f29f77f

Change-Id: Iefb3d33a407aa719c988217b136187378617da8f
2016-08-24 17:37:53 +00:00
Alan Viverette
70ccc698ec Avoid potential re-entry as a result of child mutation
am: 66b3a0d1aa

Change-Id: I1fa6619145a6aaceb4c743d378fbc5b198da6cdd
2016-08-24 17:37:50 +00:00
TreeHugger Robot
462f29f77f Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev 2016-08-24 17:27:09 +00:00
Tony Mantler
97231323b7 Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev 2016-08-24 17:00:04 +00:00
Salvador Martinez
18bf581c77 Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.

Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b83)
2016-08-24 16:43:22 +00:00
Alan Viverette
11a84b8429 Ensure the layer drawable callback is set when loading from theme
Previously we would skip setting the changing configurations and callback
if the drawable had been loaded post-inflation from a theme attribute.

Bug: 30756548
Change-Id: Ia5457723ae8a62506a7562299d3fe78ec21f8030
2016-08-24 12:35:47 -04:00
Alan Viverette
1bb8f51e76 Override LinearLayout's onLayout pass in AlertDialogLayout
LinearLayout sets up internal state during onLayout that's missing when
we override onMeasure. Avoid calling super.onMeasure() by re-implementing
onLayout without the internal state dependencies.

Bug: 30494039
Change-Id: I1149517a2fe5f5afdb4125db5e7f573588fea740
2016-08-24 12:26:27 -04:00
Tenghui Zhu
3512b0001a Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev 2016-08-24 16:22:38 +00:00
Rubin Xu
4d826638ab Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev 2016-08-24 14:23:44 +00:00
Jaewan Kim
473c683ca6 Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev 2016-08-24 05:34:29 +00:00
Sungsoo Lim
c23c2771de Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev 2016-08-24 01:53:22 +00:00