Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,062 Commits 3 Branches 0 Tags
159d7bbde0c451e080cfc41d89ecab0d0aca4b26
Commit Graph

238062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohei Yukawa
159d7bbde0 Merge changes I2d6f9932,Ib3cc799d into nyc-dev am: d1f7c4bad1 
am: c216529077

* commit 'c2165290779a86cbfceca2a25447425c0373f0e4':
  Rely on SystemService#onSwitchUser() in TSMS.
  Switch to SystemService lifecycle in TSMS.
 2016-03-07 22:22:33 +00:00
Yohei Yukawa
c216529077 Merge changes I2d6f9932,Ib3cc799d into nyc-dev 
am: d1f7c4bad1

* commit 'd1f7c4bad186b64d4d3f3cb56ac610afc2e81b86':
  Rely on SystemService#onSwitchUser() in TSMS.
  Switch to SystemService lifecycle in TSMS.
 2016-03-07 22:17:13 +00:00
Yohei Yukawa
d1f7c4bad1 Merge changes I2d6f9932,Ib3cc799d into nyc-dev 
* changes:
  Rely on SystemService#onSwitchUser() in TSMS.
  Switch to SystemService lifecycle in TSMS.
 2016-03-07 22:12:58 +00:00
Seigo Nonaka
ab4aff3b02 Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev am: 0ebc68a0e2 
am: 8f2041cb3e

* commit '8f2041cb3e98a7c62c368587a2c663158996402c':
  Introduce script matching for enabling default IME subtypes.
 2016-03-07 22:01:13 +00:00
Deepanshu Gupta
aaddebf00f Merge "Change BridgeResources to Resources_Delegate" into nyc-dev am: 7ba6dc0fcc 
am: 0a89e933be

* commit '0a89e933beebdc1ed87ad75955d1faad713473eb':
  Change BridgeResources to Resources_Delegate
 2016-03-07 21:56:25 +00:00
Diego Perez
742a4bb5f1 Merge "Animated vector drawable support" into nyc-dev am: 5b5b1c0c5d 
am: 61c3cc2647

* commit '61c3cc26470fcd5f5acaa0100da8ef16bdd256b8':
  Animated vector drawable support
 2016-03-07 21:53:45 +00:00
Seigo Nonaka
8f2041cb3e Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev 
am: 0ebc68a0e2

* commit '0ebc68a0e2134cc70b6df8eb6cb37352007f7293':
  Introduce script matching for enabling default IME subtypes.
 2016-03-07 21:51:56 +00:00
Deepanshu Gupta
0a89e933be Merge "Change BridgeResources to Resources_Delegate" into nyc-dev 
am: 7ba6dc0fcc

* commit '7ba6dc0fcc66c96383aabd8db40adf1bac66ce7f':
  Change BridgeResources to Resources_Delegate
 2016-03-07 21:49:58 +00:00
Adam Lesinski
cdb99bac7b Merge "Revert "AssetManager: Cache a pre-filtered list of configurations"" into nyc-dev am: 53185a50d1 
am: 1c4bf556a4

* commit '1c4bf556a4a7d288b6013ec95bd0c31808150286':
  Revert "AssetManager: Cache a pre-filtered list of configurations"
 2016-03-07 21:49:28 +00:00
Diego Perez
61c3cc2647 Merge "Animated vector drawable support" into nyc-dev 
am: 5b5b1c0c5d

* commit '5b5b1c0c5debd7a90c086f36cbafa688c857a673':
  Animated vector drawable support
 2016-03-07 21:47:58 +00:00
Jean-Michel Trivi
f1ea52b4dc Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev am: 310355d28e 
am: d09dfbebfd

* commit 'd09dfbebfd9b56de6c80efa4eca6b15e5474ba4c':
  Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
 2016-03-07 21:45:05 +00:00
Adam Lesinski
1c4bf556a4 Merge "Revert "AssetManager: Cache a pre-filtered list of configurations"" into nyc-dev 
am: 53185a50d1

* commit '53185a50d18239088f5a2f3cf9a11a6da7a286fb':
  Revert "AssetManager: Cache a pre-filtered list of configurations"
 2016-03-07 21:45:05 +00:00
Jean-Michel Trivi
d09dfbebfd Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev 
am: 310355d28e

* commit '310355d28e73ff4192e597b99af202a9045fa7e2':
  Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
 2016-03-07 21:43:04 +00:00
Yohei Yukawa
9faa2aeb8a Rely on SystemService#onSwitchUser() in TSMS. 
SystemService class has already provided SystemService#onSwitchUser()
callback event.  We do not need to set up SynchronousUserSwitchObserver
separately in TextServicesManagerService.

Bug: 25816558
Bug: 27456430
Change-Id: I2d6f9932f30b72cf4ae4bc0c41810f75e2667478
 2016-03-07 13:42:07 -08:00
Yohei Yukawa
a6a152e7de Switch to SystemService lifecycle in TSMS. 
Like we did this for InputMethodManagerService [1],
TextServicesManagerService (TSMS) needs to be recognized by
SystemServiceManager with SystemService lifecycle mechanism so that we
can receive SystemService#onUnlockUser() event, which is necessary to
make TSMS encryption-aware.

As a preparation, with this CL we only does mechcanical migration to
SystemService lifecycle mechanism in TSMS.  Hence no user-visible
behavior change should occur.

  [1]: Ic17667df60b30e5355b61a3601ad27a000cab3a3
       1e33dc8fdf

Bug: 27456430
Change-Id: Ib3cc799d384f259b4fa3f5295f2da198df015eb8
 2016-03-07 13:41:15 -08:00
Seigo Nonaka
0ebc68a0e2 Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev 2016-03-07 21:28:54 +00:00
Jean-Michel Trivi
fb7a388b9d Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration" 
am: 4f9c05c382

* commit '4f9c05c3823ea73b17fb6b14707dc2ce3f9d760c':
  Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
 2016-03-07 21:11:44 +00:00
Jean-Michel Trivi
4f9c05c382 Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration" 
This reverts commit 99278e1c72.

Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
(cherry picked from commit 431ec6cdb9)
 2016-03-07 21:00:25 +00:00
Xavier Ducrohet
7ba6dc0fcc Merge "Change BridgeResources to Resources_Delegate" into nyc-dev 2016-03-07 20:28:14 +00:00
Xavier Ducrohet
5b5b1c0c5d Merge "Animated vector drawable support" into nyc-dev 2016-03-07 20:26:56 +00:00
Adam Lesinski
53185a50d1 Merge "Revert "AssetManager: Cache a pre-filtered list of configurations"" into nyc-dev 2016-03-07 20:22:24 +00:00
Jean-Michel Trivi
310355d28e Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev 2016-03-07 19:59:42 +00:00
Jean-Michel Trivi
431ec6cdb9 Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration" 
This reverts commit 99278e1c72.

Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
 2016-03-07 19:59:21 +00:00
Jean-Michel Trivi
cffe9145ec Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 46f5429768 
am: b4a08fbd00

* commit 'b4a08fbd00d631f8f2508915e9d04c0ed9650d16':
  Rename AudioRecordConfiguration to AudioRecordingConfiguration
 2016-03-07 19:53:33 +00:00
Seigo Nonaka
072a95a309 Introduce script matching for enabling default IME subtypes. 
This is 2nd attempt of I5bb1bd8cdb9096d516d60beb9936e55bf2b757ae

The motivation of this CL is enhance the default IME subtype enabling
algorithm.  The new approach is done by score based algorithm.  The
design of the matching score is determined as follows:
- The matching score for the each two locale is up to 3 and determined
  as follows:
  - Score of 3 : matches all language, script and country.
  - Score of 2 : matches the language and script.
  - Score of 1 : matches the language regardless of country.
  - Score of 0 : doesn't match the language regardless of script and
                 country.
- All locales are fully expanded before matching by addLikelySubtags in
  ICU.

Bug: 27129703
Bug: 27348943
Change-Id: I8fc774154f5175abff2f16e8f12a4847bf5f5b7c
 2016-03-07 11:50:30 -08:00
Jean-Michel Trivi
b4a08fbd00 Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev 
am: 46f5429768

* commit '46f5429768045e0ba15229c7317429e3a1d15bac':
  Rename AudioRecordConfiguration to AudioRecordingConfiguration
 2016-03-07 19:49:18 +00:00
Muyuan Li
71b799b31f Making AccessibilityUtils interface multi-user aware am: 19df1284d9 
am: 83232421ca

* commit '83232421caa71bfae7c64e9c3c650d6387fe0705':
  Making AccessibilityUtils interface multi-user aware
 2016-03-07 19:47:53 +00:00
Wale Ogunwale
57e1efeccb Merge "Fixed IndexOutOfBoundsException when removing child windows" into nyc-dev am: 8482826287 
am: e5b1f02800

* commit 'e5b1f02800d0dc8e2e2a2c9284bd0a5e5fa1a16b':
  Fixed IndexOutOfBoundsException when removing child windows
 2016-03-07 19:45:15 +00:00
Jeff Tinker
a531724c88 Merge "Add error code to MediaCodec.CryptoException" into nyc-dev am: b849eeab26 
am: d83f4fc837

* commit 'd83f4fc837cf344c81def1284aa1af8757703b3e':
  Add error code to MediaCodec.CryptoException
 2016-03-07 19:42:11 +00:00
Muyuan Li
83232421ca Making AccessibilityUtils interface multi-user aware 
am: 19df1284d9

* commit '19df1284d9a545df044815adf57cf5c160d306fd':
  Making AccessibilityUtils interface multi-user aware
 2016-03-07 19:41:57 +00:00
Adam Lesinski
fa7d78ae87 Revert "AssetManager: Cache a pre-filtered list of configurations" 
There is a race due to the modification of shared data structures in the framework ResTable.

See b/27499488

This reverts commit d4b169173a.

Change-Id: I3f400a2ad3b5ffc652b84dd5fe777f7cf34b5548
 2016-03-07 19:39:56 +00:00
Wale Ogunwale
e5b1f02800 Merge "Fixed IndexOutOfBoundsException when removing child windows" into nyc-dev 
am: 8482826287

* commit '8482826287ac2fdb2440213155cf134b7e713283':
  Fixed IndexOutOfBoundsException when removing child windows
 2016-03-07 19:39:48 +00:00
Pablo Ceballos
d0477e4b63 Merge "Implement glCreateShaderProgramv JNI" into nyc-dev am: 659f3a11e9 
am: dce6269003

* commit 'dce6269003a098a69b558eebd8ae3b6c6b7d7e31':
  Implement glCreateShaderProgramv JNI
 2016-03-07 19:39:14 +00:00
Philip P. Moltmann
cb0f198995 Merge "Add "app printer activity" and always keep the print service state updated. Also fiddle with the UI to use more standard values." into nyc-dev am: 02a465ace7 
am: 74b16200fd

* commit '74b16200fd6624f6fdaccd08509e912a54494677':
  Add "app printer activity" and always keep the print service state updated. Also fiddle with the UI to use more standard values.
 2016-03-07 19:37:06 +00:00
Jeff Tinker
d83f4fc837 Merge "Add error code to MediaCodec.CryptoException" into nyc-dev 
am: b849eeab26

* commit 'b849eeab26a8635dbc3dc08127bfbbc7135fc47c':
  Add error code to MediaCodec.CryptoException
 2016-03-07 19:37:03 +00:00
Yohei Yukawa
93cda9a0e9 Merge "Ensure PopupDecorView is not IME-focusable during exit transition." into nyc-dev am: 64177e51e4 
am: b5069e05e0

* commit 'b5069e05e04ea34631b366fcd99519974f71fdbf':
  Ensure PopupDecorView is not IME-focusable during exit transition.
 2016-03-07 19:33:53 +00:00
Pablo Ceballos
dce6269003 Merge "Implement glCreateShaderProgramv JNI" into nyc-dev 
am: 659f3a11e9

* commit '659f3a11e92d6a9f66da45819401c9d41c50f437':
  Implement glCreateShaderProgramv JNI
 2016-03-07 19:33:51 +00:00
Chris Craik
762e1a17d3 Merge "Reject RenderNodes contents when clip is empty" into nyc-dev am: a98222ae7a 
am: c27eb736a9

* commit 'c27eb736a90c7d4a5cf1d18912b4cfb0596ca744':
  Reject RenderNodes contents when clip is empty
 2016-03-07 19:30:52 +00:00
Philip P. Moltmann
74b16200fd Merge "Add "app printer activity" and always keep the print service state updated. Also fiddle with the UI to use more standard values." into nyc-dev 
am: 02a465ace7

* commit '02a465ace7063cc271f5565f78857dc22a14ca56':
  Add "app printer activity" and always keep the print service state updated. Also fiddle with the UI to use more standard values.
 2016-03-07 19:30:45 +00:00
Jean-Michel Trivi
46f5429768 Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev 2016-03-07 19:29:04 +00:00
Yohei Yukawa
b5069e05e0 Merge "Ensure PopupDecorView is not IME-focusable during exit transition." into nyc-dev 
am: 64177e51e4

* commit '64177e51e4148e13f8ba45c025316660aff7f79c':
  Ensure PopupDecorView is not IME-focusable during exit transition.
 2016-03-07 19:28:44 +00:00
Philip P. Moltmann
9a63b11b56 Merge "Do not move PDF content as the content is already moved." into nyc-dev am: 75e9129453 
am: ef29bce113

* commit 'ef29bce11302c6cb42bfb5e3a8e064ff08a9401c':
  Do not move PDF content as the content is already moved.
 2016-03-07 19:26:42 +00:00
Chris Craik
c27eb736a9 Merge "Reject RenderNodes contents when clip is empty" into nyc-dev 
am: a98222ae7a

* commit 'a98222ae7ad4d5ea33892ed008f5b1b68efedfed':
  Reject RenderNodes contents when clip is empty
 2016-03-07 19:26:05 +00:00
Philip P. Moltmann
ef29bce113 Merge "Do not move PDF content as the content is already moved." into nyc-dev 
am: 75e9129453

* commit '75e91294530aea50f8ee8255205429395d728ce5':
  Do not move PDF content as the content is already moved.
 2016-03-07 19:24:05 +00:00
Muyuan Li
19df1284d9 Making AccessibilityUtils interface multi-user aware 
The getEnabledServices and setAccessibilityServiceState now have an
overloaded version to take in a userId parameter.

Bug: 27383941
Change-Id: I3ea648fd5f22cd2e9402686b83ca42976b5306f8
(cherry picked from commit 2d1c0154b1f9aeeb991dc96efb29aa53c76f4957)
 2016-03-07 19:08:04 +00:00
Philip P. Moltmann
68672207a9 Merge "Update print document view if printer capabilities changed" into nyc-dev am: 59d12c6a27 
am: 46e682a449

* commit '46e682a4497700c4cb2ab164d167ab5a305f6811':
  Update print document view if printer capabilities changed
 2016-03-07 18:30:39 +00:00
Wale Ogunwale
8482826287 Merge "Fixed IndexOutOfBoundsException when removing child windows" into nyc-dev 2016-03-07 18:24:44 +00:00
Jeff Tinker
b849eeab26 Merge "Add error code to MediaCodec.CryptoException" into nyc-dev 2016-03-07 18:18:10 +00:00
Pablo Ceballos
659f3a11e9 Merge "Implement glCreateShaderProgramv JNI" into nyc-dev 2016-03-07 18:17:26 +00:00
Philip P. Moltmann
02a465ace7 Merge "Add "app printer activity" and always keep the print service state updated. Also fiddle with the UI to use more standard values." into nyc-dev 2016-03-07 18:14:14 +00:00