Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shinji Sogo
20445f7bd0 Don't compare FQDN with providerFriendlyName 
FQDN and providor friendly name are obviously different, and if they're
compared they're almost always unmatched. FQDN of current configuration
should be checked with FQDN of new configuration.

Bug:31815374
Test: Test with the device

Change-Id: I6c8c8ca07b4abb038175e3999d387f0869ec7391
 2016-09-29 19:43:11 +09:00
Sungsoo
2eca8e739b Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev am: f66508ada9 
am: 20b618ccb0

Change-Id: Ia6283edc141ab4382e16cfd247fc9b66503b3165
 2016-09-29 09:38:22 +00:00
Sungsoo
38b5579261 Revert "AudioService: remove deprecated forcing of A2DP off" am: cf09fe6801 
am: 8902c288b7

Change-Id: Icbdf6db61b8b31118f267aa6cdc637afc696e678
 2016-09-29 09:37:03 +00:00
Sungsoo
c6b31397a6 Revert "AudioService: restore A2DP/wired headset auto selection" am: 486f7d3fcd 
am: 3e6a30c07a

Change-Id: Ib6cc5d9d1c7afe1fc094efe611348ddf1720e547
 2016-09-29 09:36:04 +00:00
Sungsoo
20b618ccb0 Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev 
am: f66508ada9

Change-Id: I74b8fc6cdc0d1a4b7d778bcb29c91cddd997d12c
 2016-09-29 09:28:46 +00:00
Sungsoo
8902c288b7 Revert "AudioService: remove deprecated forcing of A2DP off" 
am: cf09fe6801

Change-Id: I280e6ecf1ede7852031f5e7f5a55231ef242e42e
 2016-09-29 09:28:41 +00:00
Sungsoo
3e6a30c07a Revert "AudioService: restore A2DP/wired headset auto selection" 
am: 486f7d3fcd

Change-Id: I2617b28501a0738ec3fcec68b0cba5e76ac58aeb
 2016-09-29 09:27:29 +00:00
TreeHugger Robot
f66508ada9 Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev 
* changes:
  Revert "AudioService: remove deprecated forcing of A2DP off"
  Revert "AudioService: restore A2DP/wired headset auto selection"
 2016-09-29 09:19:07 +00:00
Svet Ganov
62a40f87b3 Add a missing case when detecting if a toast can be added 
We allow only one toast window per UID to be added at a
time. We ignore windows that run exit animation but we
should also ignore windows that should be removed after
the exit animation.

bug:31340854

Change-Id: I51c21f2c0e04341697f61e4cc107f9116254b206
 2016-09-29 08:19:52 +00:00
Bill Yi
cbedf9e437 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e7c74c064f -s ours 
am: da62d73d70  -s ours

Change-Id: I0aeaa173964040b89f8711cc222f8845e2316fae
 2016-09-29 07:50:34 +00:00
Bill Yi
4185a7cd85 Import translations. DO NOT MERGE am: 87342b4efb -s ours 
am: 7d7f03b774  -s ours

Change-Id: I4130886f2a923aa06000dd4152164a7f5c4bd4cf
 2016-09-29 07:49:37 +00:00
Bill Yi
a1bcb2fb67 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4f6d64ea0d -s ours 
am: 331cc39563  -s ours

Change-Id: I83c55695fe2ec35fdc6fca753a8c62b90d90a36e
 2016-09-29 07:48:39 +00:00
Bill Yi
59cbce4cab Import translations. DO NOT MERGE am: 3860bee3d0 -s ours 
am: 3024df7772  -s ours

Change-Id: I1b055f0d21b0b200a052bf0f6b98979b7d9f0079
 2016-09-29 07:47:40 +00:00
Bill Yi
76d32ec760 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: b1e6e0c6cd  -s ours

Change-Id: I4d4df109060fa760fbd6b3b6aeffc83e4baf0e75
 2016-09-29 07:44:03 +00:00
Bill Yi
fc56b70616 Import translations. DO NOT MERGE 
am: 92a4f293d1  -s ours

Change-Id: Ieea64fe592effe679fcf5e327a8558a871b6be2b
 2016-09-29 07:43:59 +00:00
Bill Yi
0c7484fe08 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 07e95ca75e  -s ours

Change-Id: Icd021e0bb8dfe54ed8b441bd5883e2ab767bc613
 2016-09-29 07:42:40 +00:00
Bill Yi
30070f06bb Import translations. DO NOT MERGE 
am: 2a2856e023  -s ours

Change-Id: I82c4e746ee7757593fa35798c065eeba5b356ae3
 2016-09-29 07:42:34 +00:00
Bill Yi
da62d73d70 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: e7c74c064f  -s ours

Change-Id: I29a6119ba5af97f06bd7ec41a847d3cfb5fad707
 2016-09-29 07:42:16 +00:00
Bill Yi
7d7f03b774 Import translations. DO NOT MERGE 
am: 87342b4efb  -s ours

Change-Id: I7c839cc344482ac592824d4a3b79791d21d716d6
 2016-09-29 07:42:13 +00:00
Bill Yi
61e96d5a3c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8e44108cf1 -s ours 
am: 0b076441a2  -s ours

Change-Id: Ie7e1cd97a519177a7fdfe9d6a634365f39d2bb5e
 2016-09-29 07:41:27 +00:00
Bill Yi
331cc39563 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 4f6d64ea0d  -s ours

Change-Id: I8c75997247b73ca0c6856f5ba14587f1da01638f
 2016-09-29 07:40:39 +00:00
Bill Yi
3024df7772 Import translations. DO NOT MERGE 
am: 3860bee3d0  -s ours

Change-Id: I20e9ef5633150a5c63afdb562d48fd029279f771
 2016-09-29 07:40:35 +00:00
Bill Yi
b8790f77be Import translations. DO NOT MERGE am: e930d5a5f4 -s ours 
am: 7ab0a985ae  -s ours

Change-Id: Ic929db922d61f1cc29c9765b2786d0af5edfdd9f
 2016-09-29 07:40:23 +00:00
TreeHugger Robot
b1e6e0c6cd Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-29 07:34:45 +00:00
TreeHugger Robot
07e95ca75e Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-29 07:34:07 +00:00
TreeHugger Robot
e7c74c064f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:32:49 +00:00
TreeHugger Robot
4f6d64ea0d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:32:18 +00:00
Bill Yi
0b076441a2 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 8e44108cf1  -s ours

Change-Id: I5a141346add5639ce1bf707ce5097859cce3bde4
 2016-09-29 07:31:35 +00:00
Bill Yi
7ab0a985ae Import translations. DO NOT MERGE 
am: e930d5a5f4  -s ours

Change-Id: Icf67ef603fa28b6b7036d51adb0251c15a2c8934
 2016-09-29 07:31:33 +00:00
TreeHugger Robot
8e44108cf1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:24:48 +00:00
David Friedman
b202c67b00 Docs: New "Power" area for "Performance" section on DAC. 
Bug: 31314206

Change-Id: I918843bd8b703e2b267d5646658de3599d4ab037
 2016-09-28 23:33:31 -07:00
David Friedman
e782434cc8 Doc: New page in DAC Performance section: how to reduce overdraw in apps. 
Bug: 31314359

Change-Id: Iecff68c1bfe16767b27e7cace8ab4bd4a91497b8
 2016-09-28 23:25:27 -07:00
Bill Yi
e930d5a5f4 Import translations. DO NOT MERGE 
Change-Id: I0dcb3da3295eebdc6757f614a44aac04396eade0
Auto-generated-cl: translation import
 2016-09-28 22:47:48 -07:00
takuya,souma
ab726b4579 Merge "Reset mCurrentUserId when fingerprintd died" am: b60951f670 
am: 674922574a

Change-Id: I7355b6da155aab3996fdd773eafc489362744846
 2016-09-29 05:12:45 +00:00
takuya,souma
674922574a Merge "Reset mCurrentUserId when fingerprintd died" 
am: b60951f670

Change-Id: I807b8c1b2d053d726c7e16dd8b8f5c2f62bdf8ad
 2016-09-29 05:08:13 +00:00
Treehugger Robot
b60951f670 Merge "Reset mCurrentUserId when fingerprintd died" 2016-09-29 05:00:42 +00:00
Svetoslav Ganov
09d3285503 Don't touch usage stats before system ready 
When a content provider is accessed we update its foreground
state and usage stats if the calling app is in the foreground.
However we install system providers before the
PHASE_SYSTEM_SERVICES_READY phase which means we cannot touch
the the usage stats service as it calls into the content
service triggering the sync manager creation before system
ready violating the contract of the latter causing cascading
issues.

bug:31562236

Change-Id: Ied446cf3de8949e0850bab8f2b92155eac793591
 2016-09-29 04:05:43 +00:00
Jim Miller
be11bc5f0a Reset mCurrentUserId when fingerprintd died 
A template fingerprint data is not loaded in fingerprintd when
fingerprintd is died and restarted.
FigerprintService tries to set userId after a restart of fingerprintd,
but it's skipped because the service tries to set same userId already
set to mCurrentUserId.

To load correct template fingerprint data, reset mCurrentUserId
when fingerprintd died.

Bug: 31734514
Change-Id: I6b8d4b5b685765fe33ef8e654593b615240748a8
 2016-09-28 20:33:06 -07:00
Mark Lu
a38b6d4953 Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev am: 7e8a5e8aa9 am: 48781d231e am: 316b2df576 
am: d8c12daf14

Change-Id: I3da6cb770eb656300609343257912258258ec1eb
 2016-09-29 03:25:39 +00:00
Mark Lu
5951cb723e docs: update docs for the multiprocess attribute in provider element am: 656fde1875 am: 9bcd53d099 am: a2a3d9e4ea 
am: 7cb1d7bc99

Change-Id: Ic9e5b6a06881b920234577e5be380b2a8919b25d
 2016-09-29 03:24:39 +00:00
Mark Lu
d8c12daf14 Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev am: 7e8a5e8aa9 am: 48781d231e 
am: 316b2df576

Change-Id: I18c5ec459fe13e3525699e64fd2961940f5f68e3
 2016-09-29 03:17:39 +00:00
Mark Lu
7cb1d7bc99 docs: update docs for the multiprocess attribute in provider element am: 656fde1875 am: 9bcd53d099 
am: a2a3d9e4ea

Change-Id: I07bfbf00607d8c06af7db02db09a37a3a8d64a9b
 2016-09-29 03:16:44 +00:00
Mark Lu
316b2df576 Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev am: 7e8a5e8aa9 
am: 48781d231e

Change-Id: I3287a88580fd0bdbf2d7c31603d0f9c07ea79bb2
 2016-09-29 03:09:30 +00:00
Mark Lu
a2a3d9e4ea docs: update docs for the multiprocess attribute in provider element am: 656fde1875 
am: 9bcd53d099

Change-Id: I3aafb4d54172c3dc344e07d7a359d5ed1f7b0e31
 2016-09-29 03:08:37 +00:00
Mark Lu
69db244677 Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev 
am: 7e8a5e8aa9

Change-Id: Ia364683f2cd24d56bc1314b922d80247dea70373
 2016-09-29 03:01:41 +00:00
Mark Lu
48781d231e Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev 
am: 7e8a5e8aa9

Change-Id: I326a6666c162e98f6058e935330967ddea901579
 2016-09-29 03:01:39 +00:00
Mark Lu
40eaffcf5b docs: update docs for the multiprocess attribute in provider element 
am: 656fde1875

Change-Id: Iac6f036d6a6d1a5f32d1e1d6d431c387cd6bf918
 2016-09-29 03:01:38 +00:00
Mark Lu
9bcd53d099 docs: update docs for the multiprocess attribute in provider element 
am: 656fde1875

Change-Id: I1f6c6f7967e530243847d104c8f6dd70015bcc98
 2016-09-29 03:01:37 +00:00
Bill Yi
3860bee3d0 Import translations. DO NOT MERGE 
Change-Id: I16e95300da82e9860f57e186d6b758a20ddee77e
Auto-generated-cl: translation import
 2016-09-28 19:55:26 -07:00
Mark Lu
7e8a5e8aa9 Merge "docs: update docs for the multiprocess attribute in provider element" into nyc-dev 2016-09-29 02:55:01 +00:00